Skip to content

Commit ead9143

Browse files
wenshaowenshao
authored
fastjson update 1.x to 2.0.2 (#4160)
1 parent bac016f commit ead9143

File tree

35 files changed

+105
-112
lines changed

35 files changed

+105
-112
lines changed

‎admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/CanalClusterController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import org.springframework.web.bind.annotation.RequestMapping;
1414
import org.springframework.web.bind.annotation.RestController;
1515

16-
import com.alibaba.fastjson.JSONArray;
17-
import com.alibaba.fastjson.JSONObject;
16+
import com.alibaba.fastjson2.JSONArray;
17+
import com.alibaba.fastjson2.JSONObject;
1818
import com.alibaba.otter.canal.admin.model.BaseModel;
1919
import com.alibaba.otter.canal.admin.model.CanalCluster;
2020
import com.alibaba.otter.canal.admin.model.NodeServer;

‎client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
import javax.sql.DataSource;
1010

11+
import com.alibaba.fastjson2.JSONWriter;
1112
import org.slf4j.Logger;
1213
import org.slf4j.LoggerFactory;
1314

14-
import com.alibaba.fastjson.JSON;
15-
import com.alibaba.fastjson.serializer.SerializerFeature;
15+
import com.alibaba.fastjson2.JSON;
1616
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
1717
import com.alibaba.otter.canal.client.adapter.es.core.config.ESSyncConfig;
1818
import com.alibaba.otter.canal.client.adapter.es.core.config.ESSyncConfig.ESMapping;
@@ -79,7 +79,7 @@ public void sync(Collection<ESSyncConfig> esSyncConfigs, Dml dml) {
7979
esSyncConfigs
8080
.forEach(esSyncConfig -> configIndexes.append(esSyncConfig.getEsMapping().get_index()).append(" "));
8181
logger.debug("DML: {} \nAffected indexes: {}",
82-
JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue),
82+
JSON.toJSONString(dml, JSONWriter.Feature.WriteNulls),
8383
configIndexes.toString());
8484
}
8585
}

‎client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
2020

21-
import com.alibaba.fastjson.JSON;
21+
import com.alibaba.fastjson2.JSON;
2222
import com.alibaba.otter.canal.client.adapter.es.core.config.ESSyncConfig.ESMapping;
2323
import com.alibaba.otter.canal.client.adapter.es.core.config.SchemaItem;
2424
import com.alibaba.otter.canal.client.adapter.es.core.config.SchemaItem.ColumnItem;

‎client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/service/HbaseSyncService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;
88

9-
import com.alibaba.fastjson.JSON;
10-
import com.alibaba.fastjson.serializer.SerializerFeature;
9+
import com.alibaba.fastjson2.JSON;
10+
import com.alibaba.fastjson2.JSONWriter.Feature;
1111
import com.alibaba.otter.canal.client.adapter.hbase.config.MappingConfig;
1212
import com.alibaba.otter.canal.client.adapter.hbase.support.*;
1313
import com.alibaba.otter.canal.client.adapter.support.Dml;
@@ -39,7 +39,7 @@ public void sync(MappingConfig config, Dml dml) {
3939
delete(config, dml);
4040
}
4141
if (logger.isDebugEnabled()) {
42-
logger.debug("DML: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
42+
logger.debug("DML: {}", JSON.toJSONString(dml, Feature.WriteNulls));
4343
}
4444
}
4545
}

‎client-adapter/kudu/src/main/java/com/alibaba/otter/canal/client/adapter/kudu/service/KuduSyncService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import org.slf4j.Logger;
1111
import org.slf4j.LoggerFactory;
1212

13-
import com.alibaba.fastjson.JSON;
14-
import com.alibaba.fastjson.serializer.SerializerFeature;
13+
import com.alibaba.fastjson2.JSON;
14+
import com.alibaba.fastjson2.JSONWriter.Feature;
1515
import com.alibaba.otter.canal.client.adapter.kudu.config.KuduMappingConfig;
1616
import com.alibaba.otter.canal.client.adapter.kudu.support.KuduTemplate;
1717
import com.alibaba.otter.canal.client.adapter.support.Dml;
@@ -55,7 +55,7 @@ public void sync(KuduMappingConfig config, Dml dml) {
5555
delete(config, dml);
5656
}
5757
if (logger.isDebugEnabled()) {
58-
logger.debug("DML: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
58+
logger.debug("DML: {}", JSON.toJSONString(dml, Feature.WriteNulls));
5959
}
6060
}
6161
}
@@ -118,7 +118,7 @@ private void delete(KuduMappingConfig config, Dml dml) {
118118
}
119119
} catch (KuduException e) {
120120
logger.error(e.getMessage());
121-
logger.error("DML: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
121+
logger.error("DML: {}", JSON.toJSONString(dml, Feature.WriteNulls));
122122
}
123123
}
124124
}
@@ -159,7 +159,7 @@ private void upsert(KuduMappingConfig config, Dml dml) {
159159
}
160160
} catch (KuduException e) {
161161
logger.error(e.getMessage());
162-
logger.error("DML: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
162+
logger.error("DML: {}", JSON.toJSONString(dml, Feature.WriteNulls));
163163
}
164164
}
165165

@@ -201,7 +201,7 @@ private void insert(KuduMappingConfig config, Dml dml) {
201201
}
202202
} catch (KuduException e) {
203203
logger.error(e.getMessage());
204-
logger.error("DML: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
204+
logger.error("DML: {}", JSON.toJSONString(dml, Feature.WriteNulls));
205205
}
206206
}
207207
}

‎client-adapter/logger/src/main/java/com/alibaba/otter/canal/client/adapter/logger/LoggerAdapterExample.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;
88

9-
import com.alibaba.fastjson.JSON;
10-
import com.alibaba.fastjson.serializer.SerializerFeature;
9+
import com.alibaba.fastjson2.JSON;
10+
import com.alibaba.fastjson2.JSONWriter.Feature;
1111
import com.alibaba.otter.canal.client.adapter.OuterAdapter;
1212
import com.alibaba.otter.canal.client.adapter.support.Dml;
1313
import com.alibaba.otter.canal.client.adapter.support.OuterAdapterConfig;
@@ -36,7 +36,7 @@ public void sync(List<Dml> dmls) {
3636
}
3737

3838
public void sync(Dml dml) {
39-
logger.info("DML: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
39+
logger.info("DML: {}", JSON.toJSONString(dml, Feature.WriteNulls));
4040
}
4141

4242
@Override

‎client-adapter/phoenix/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
<scope>test</scope>
7676
</dependency>
7777
<dependency>
78-
<groupId>com.alibaba</groupId>
79-
<artifactId>fastjson</artifactId>
80-
<version>1.2.58</version>
78+
<groupId>com.alibaba.fastjson2</groupId>
79+
<artifactId>fastjson2</artifactId>
80+
<version>2.0.2</version>
8181
<scope>provided</scope>
8282
</dependency>
8383

‎client-adapter/phoenix/src/main/java/com/alibaba/otter/canal/client/adapter/phoenix/service/PhoenixSyncService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import com.alibaba.druid.sql.ast.statement.*;
77
import com.alibaba.druid.sql.parser.ParserException;
88
import com.alibaba.druid.util.JdbcConstants;
9-
import com.alibaba.fastjson.JSON;
10-
import com.alibaba.fastjson.serializer.SerializerFeature;
9+
import com.alibaba.fastjson2.JSON;
10+
import com.alibaba.fastjson2.JSONWriter.Feature;
1111
import com.alibaba.otter.canal.client.adapter.phoenix.config.ConfigurationManager;
1212
import com.alibaba.otter.canal.client.adapter.phoenix.config.MappingConfig;
1313
import com.alibaba.otter.canal.client.adapter.phoenix.config.MappingConfig.DbMapping;
@@ -208,7 +208,7 @@ public void sync(Map<String, Map<String, MappingConfig>> mappingConfig, List<Dml
208208
for (Map.Entry<String, MappingConfig> entry : configMap.entrySet()) {
209209
MappingConfig config = entry.getValue();
210210
if (config.isDebug()) {
211-
logger.info("DML: {} {}", entry.getKey(), JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
211+
logger.info("DML: {} {}", entry.getKey(), JSON.toJSONString(dml, Feature.WriteNulls));
212212
}
213213
if (config.getConcurrent()) {
214214
//并行同步
@@ -257,7 +257,7 @@ private void sync(BatchExecutor batchExecutor, MappingConfig config, SingleDml d
257257
} else if (type != null && type.equalsIgnoreCase("TRUNCATE")) {
258258
truncate(batchExecutor, config);
259259
} else if (logger.isInfoEnabled()){
260-
logger.info("SingleDml: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
260+
logger.info("SingleDml: {}", JSON.toJSONString(dml, Feature.WriteNulls));
261261
}
262262
} catch (SQLException e) {
263263
logger.error("sync error: " + e.getMessage(), e);
@@ -268,7 +268,7 @@ private void sync(BatchExecutor batchExecutor, MappingConfig config, SingleDml d
268268

269269
private void alter(BatchExecutor batchExecutor, MappingConfig config, Dml dml, List<SQLStatement> stmtList, String configFile) throws SQLException {
270270
if (config.isDebug()) {
271-
logger.info("DML: {} {}", configFile, JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
271+
logger.info("DML: {} {}", configFile, JSON.toJSONString(dml, Feature.WriteNulls));
272272
}
273273
DbMapping dbMapping = config.getDbMapping();
274274
if (!dbMapping.isAlter()) {

‎client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbMirrorDbSyncService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import org.slf4j.Logger;
1414
import org.slf4j.LoggerFactory;
1515

16-
import com.alibaba.fastjson.JSON;
17-
import com.alibaba.fastjson.serializer.SerializerFeature;
16+
import com.alibaba.fastjson2.JSON;
17+
import com.alibaba.fastjson2.JSONWriter.Feature;
1818
import com.alibaba.otter.canal.client.adapter.rdb.config.MappingConfig;
1919
import com.alibaba.otter.canal.client.adapter.rdb.config.MirrorDbConfig;
2020
import com.alibaba.otter.canal.client.adapter.rdb.support.SingleDml;
@@ -68,7 +68,7 @@ public void sync(List<Dml> dmls) {
6868
if (dml.getIsDdl() != null && dml.getIsDdl() && StringUtils.isNotEmpty(dml.getSql())) {
6969
// DDL
7070
if (logger.isDebugEnabled()) {
71-
logger.debug("DDL: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
71+
logger.debug("DDL: {}", JSON.toJSONString(dml, Feature.WriteNulls));
7272
}
7373
executeDdl(mirrorDbConfig, dml);
7474
rdbSyncService.getColumnsTypeCache().remove(destination + "." + database + "." + dml.getTable());

‎client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbSyncService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323

24-
import com.alibaba.fastjson.JSON;
25-
import com.alibaba.fastjson.serializer.SerializerFeature;
24+
import com.alibaba.fastjson2.JSON;
25+
import com.alibaba.fastjson2.JSONWriter.Feature;
2626
import com.alibaba.otter.canal.client.adapter.rdb.config.MappingConfig;
2727
import com.alibaba.otter.canal.client.adapter.rdb.config.MappingConfig.DbMapping;
2828
import com.alibaba.otter.canal.client.adapter.rdb.support.BatchExecutor;
@@ -220,7 +220,7 @@ public void sync(BatchExecutor batchExecutor, MappingConfig config, SingleDml dm
220220
truncate(batchExecutor, config);
221221
}
222222
if (logger.isDebugEnabled()) {
223-
logger.debug("DML: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
223+
logger.debug("DML: {}", JSON.toJSONString(dml, Feature.WriteNulls));
224224
}
225225
} catch (SQLException e) {
226226
throw new RuntimeException(e);

0 commit comments

Comments
 (0)