Skip to content

refactor: migrate from fastjson to fastjson2 across multiple services #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
psxjoy wants to merge 1 commit into from
Closed

refactor: migrate from fastjson to fastjson2 across multiple services #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ozhera-app/app-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
</dependency>

<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<scope>compile</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions ...p/app-service/src/main/java/org/apache/ozhera/app/service/mq/RocketMqHeraAppProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
*/
package org.apache.ozhera.app.service.mq;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSON;
import com.alibaba.nacos.api.config.annotation.NacosValue;
import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage;
import lombok.extern.slf4j.Slf4j;
import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage;
import org.apache.rocketmq.client.producer.DefaultMQProducer;
import org.apache.rocketmq.common.message.Message;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
6 changes: 0 additions & 6 deletions ozhera-demo-client/ozhera-demo-client-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-client</artifactId>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
11 changes: 5 additions & 6 deletions ozhera-log/log-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ http://www.apache.org/licenses/LICENSE-2.0
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-client</artifactId>
<exclusions>
<exclusion>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -119,6 +113,11 @@ http://www.apache.org/licenses/LICENSE-2.0
</exclusions>
</dependency>

<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>

<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/common/trace/TraceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
package org.apache.ozhera.log.agent.common.trace;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.Sets;
import org.apache.ozhera.tspandata.TAttributeKey;
import org.apache.ozhera.tspandata.TAttributeType;
Expand Down
18 changes: 14 additions & 4 deletions ozhera-log/log-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ http://www.apache.org/licenses/LICENSE-2.0
<dependency>
<groupId>run.mone</groupId>
<artifactId>nacos</artifactId>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -66,6 +72,10 @@ http://www.apache.org/licenses/LICENSE-2.0
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>

<dependency>
<groupId>run.mone</groupId>
Expand All @@ -75,6 +85,10 @@ http://www.apache.org/licenses/LICENSE-2.0
<groupId>com.alibaba.spring</groupId>
<artifactId>spring-context-support</artifactId>
</exclusion>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -242,10 +256,6 @@ http://www.apache.org/licenses/LICENSE-2.0
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
</exclusion>
<exclusion>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/domain/TraceLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package org.apache.ozhera.log.manager.domain;

import cn.hutool.core.date.DateTime;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import org.apache.ozhera.log.api.model.dto.TraceLogDTO;
Expand Down
2 changes: 1 addition & 1 deletion ...og/log-manager/src/main/java/org/apache/ozhera/log/manager/model/pojo/MilogLogTailDo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.ozhera.log.manager.model.pojo;

import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson2.annotation.JSONField;
import org.apache.ozhera.log.api.model.meta.FilterDefine;
import org.apache.ozhera.log.manager.model.BaseCommon;
import org.apache.ozhera.log.manager.model.dto.MotorRoomDTO;
Expand Down
2 changes: 1 addition & 1 deletion ...g-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/EsDataServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Pair;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.Lists;
import com.xiaomi.mone.es.EsClient;
import com.xiaomi.youpin.docean.Ioc;
Expand Down
8 changes: 4 additions & 4 deletions ozhera-log/log-stream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ http://www.apache.org/licenses/LICENSE-2.0
<groupId>run.mone</groupId>
<artifactId>docean</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>

<dependency>
<groupId>org.apache.rocketmq</groupId>
Expand All @@ -65,10 +69,6 @@ http://www.apache.org/licenses/LICENSE-2.0
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
</exclusion>
<exclusion>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
</exclusions>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/apache/ozhera/log/stream/job/extension/impl/RocketCompensateMsgConsume.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.ozhera.log.stream.job.extension.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSON;
import com.google.gson.internal.LinkedTreeMap;
import com.google.gson.reflect.TypeToken;
import com.xiaomi.mone.es.EsProcessor;
Expand Down
2 changes: 1 addition & 1 deletion ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/plugin/es/EsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package org.apache.ozhera.log.stream.plugin.es;

import cn.hutool.core.collection.ListUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.xiaomi.mone.es.EsProcessor;
Expand Down
5 changes: 3 additions & 2 deletions ozhera-monitor/ozhera-monitor-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@
<dependencies>

<dependency>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
<artifactId>fastjson2</artifactId>
<groupId>com.alibaba.fastjson2</groupId>
</dependency>


<dependency>
<groupId>run.mone</groupId>
<artifactId>common</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions ...tor-service/src/main/java/org/apache/ozhera/monitor/service/http/RestTemplateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.ozhera.monitor.service.http;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.nacos.api.config.annotation.NacosValue;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -88,14 +88,14 @@ public String getHttpM(String url, Map map){
return result;
}

public String getHttpMPost(String url, com.alibaba.fastjson.JSONObject param, MediaType mediaType){
public String getHttpMPost(String url, com.alibaba.fastjson2.JSONObject param, MediaType mediaType){

log.info("RestTemplateService.getHttpMPost url:{},param:{},mediaType:{}",url,param,mediaType);

HttpHeaders headers = new HttpHeaders();
headers.setContentType(mediaType);

HttpEntity<com.alibaba.fastjson.JSONObject> request = new HttpEntity<>(param, headers);
HttpEntity<com.alibaba.fastjson2.JSONObject> request = new HttpEntity<>(param, headers);
// 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
String result = null;
try {
Expand Down
Loading