update fastjson version

adswriter/src/main/java/com/alibaba/datax/plugin/writer/adswriter/insert/AdsClientProxy.java

@@ -18,7 +18,7 @@
 import com.alibaba.datax.plugin.writer.adswriter.ads.TableInfo;
 import com.alibaba.datax.plugin.writer.adswriter.util.Constant;
 import com.alibaba.datax.plugin.writer.adswriter.util.Key;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;

cassandrareader/src/main/java/com/alibaba/datax/plugin/reader/cassandrareader/CassandraReaderHelper.java

@@ -23,7 +23,7 @@
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.common.plugin.TaskPluginCollector;
 import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.CodecRegistry;

cassandrawriter/src/main/java/com/alibaba/datax/plugin/writer/cassandrawriter/CassandraWriterHelper.java

@@ -18,10 +18,10 @@
 
 import com.alibaba.datax.common.element.Column;
 import com.alibaba.datax.common.exception.DataXException;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONException;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONException;
+import com.alibaba.fastjson2.JSONObject;
 
 import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.CodecRegistry;
@@ -204,7 +204,7 @@ public static Object parseFromJson(Object jsonObject,DataType type) throws Excep
 
     case MAP: {
       Map m = new HashMap();
-      for (JSONObject.Entry e : ((JSONObject)jsonObject).entrySet()) {
+      for (Map.Entry e : ((JSONObject)jsonObject).entrySet()) {
         Object k = parseFromString((String) e.getKey(), type.getTypeArguments().get(0));
         Object v = parseFromJson(e.getValue(), type.getTypeArguments().get(1));
         m.put(k,v);
@@ -233,7 +233,7 @@ public static Object parseFromJson(Object jsonObject,DataType type) throws Excep
     case UDT: {
       UDTValue t = ((UserType) type).newValue();
       UserType userType = t.getType();
-      for (JSONObject.Entry e : ((JSONObject)jsonObject).entrySet()) {
+      for (Map.Entry e : ((JSONObject)jsonObject).entrySet()) {
         DataType eleType = userType.getFieldType((String)e.getKey());
         t.set((String)e.getKey(), parseFromJson(e.getValue(), eleType), registry.codecFor(eleType).getJavaType());
       }

clickhousewriter/src/main/java/com/alibaba/datax/plugin/writer/clickhousewriter/ClickhouseWriter.java

@@ -10,8 +10,8 @@
 import com.alibaba.datax.plugin.rdbms.util.DBUtilErrorCode;
 import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 import com.alibaba.datax.plugin.rdbms.writer.CommonRdbmsWriter;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 
 import java.sql.Array;
 import java.sql.Connection;

common/pom.xml

@@ -17,8 +17,8 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

common/src/main/java/com/alibaba/datax/common/element/Column.java

@@ -1,6 +1,6 @@
 package com.alibaba.datax.common.element;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

common/src/main/java/com/alibaba/datax/common/util/Configuration.java

@@ -3,8 +3,8 @@
 import com.alibaba.datax.common.exception.CommonErrorCode;
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.common.spi.ErrorCode;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONWriter;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.CharUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -586,7 +586,7 @@ public <T> T get(final String path, Class<T> clazz) {
 	 */
 	public String beautify() {
 		return JSON.toJSONString(this.getInternal(),
-				SerializerFeature.PrettyFormat);
+				JSONWriter.Feature.PrettyFormat);
 	}
 
 	/**

core/src/main/java/com/alibaba/datax/core/job/JobContainer.java

@@ -27,7 +27,7 @@
 import com.alibaba.datax.core.util.container.CoreConstant;
 import com.alibaba.datax.core.util.container.LoadUtil;
 import com.alibaba.datax.dataxservice.face.domain.enums.ExecuteMode;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.slf4j.Logger;

core/src/main/java/com/alibaba/datax/core/statistics/communication/CommunicationTool.java

@@ -2,7 +2,7 @@
 
 import com.alibaba.datax.common.statistics.PerfTrace;
 import com.alibaba.datax.common.util.StrUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import org.apache.commons.lang.Validate;
 
 import java.text.DecimalFormat;

core/src/main/java/com/alibaba/datax/core/statistics/plugin/task/StdoutPluginCollector.java

@@ -6,7 +6,7 @@
 import com.alibaba.datax.core.statistics.communication.Communication;
 import com.alibaba.datax.core.util.container.CoreConstant;
 import com.alibaba.datax.core.statistics.plugin.task.util.DirtyRecord;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

core/src/main/java/com/alibaba/datax/core/statistics/plugin/task/util/DirtyRecord.java

@@ -4,7 +4,7 @@
 import com.alibaba.datax.common.element.Record;
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.core.util.FrameworkErrorCode;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

core/src/main/java/com/alibaba/datax/core/taskgroup/TaskGroupContainer.java

@@ -27,7 +27,7 @@
 import com.alibaba.datax.core.util.container.CoreConstant;
 import com.alibaba.datax.core.util.container.LoadUtil;
 import com.alibaba.datax.dataxservice.face.domain.enums.State;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/com/alibaba/datax/core/transport/record/DefaultRecord.java

@@ -5,7 +5,7 @@
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.core.util.ClassSize;
 import com.alibaba.datax.core.util.FrameworkErrorCode;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 import java.util.ArrayList;
 import java.util.HashMap;

datahubreader/src/main/java/com/alibaba/datax/plugin/reader/datahubreader/DatahubClientHelper.java

@@ -1,8 +1,8 @@
 package com.alibaba.datax.plugin.reader.datahubreader;
 
 import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 import com.aliyun.datahub.client.DatahubClient;
 import com.aliyun.datahub.client.DatahubClientBuilder;
 import com.aliyun.datahub.client.auth.Account;

datahubwriter/src/main/java/com/alibaba/datax/plugin/writer/datahubwriter/DatahubClientHelper.java

@@ -3,8 +3,8 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 import com.aliyun.datahub.client.DatahubClient;
 import com.aliyun.datahub.client.DatahubClientBuilder;
 import com.aliyun.datahub.client.auth.Account;

datahubwriter/src/main/java/com/alibaba/datax/plugin/writer/datahubwriter/DatahubWriter.java

@@ -8,7 +8,7 @@
 import com.alibaba.datax.common.util.Configuration;
 import com.alibaba.datax.common.util.DataXCaseEnvUtil;
 import com.alibaba.datax.common.util.RetryUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.aliyun.datahub.client.DatahubClient;
 import com.aliyun.datahub.client.model.FieldType;
 import com.aliyun.datahub.client.model.GetTopicResult;

doriswriter/src/main/java/com/alibaba/datax/plugin/writer/doriswriter/DorisJsonCodec.java

@@ -1,7 +1,7 @@
 package com.alibaba.datax.plugin.writer.doriswriter;
 
 import com.alibaba.datax.common.element.Record;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 import java.util.HashMap;
 import java.util.List;

doriswriter/src/main/java/com/alibaba/datax/plugin/writer/doriswriter/DorisStreamLoadObserver.java

@@ -1,6 +1,6 @@
 package com.alibaba.datax.plugin.writer.doriswriter;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;

elasticsearchwriter/src/main/java/com/alibaba/datax/plugin/writer/elasticsearchwriter/ElasticSearchClient.java

@@ -5,8 +5,8 @@
 import com.alibaba.datax.plugin.writer.elasticsearchwriter.jest.ClusterInfo;
 import com.alibaba.datax.plugin.writer.elasticsearchwriter.jest.ClusterInfoResult;
 import com.alibaba.datax.plugin.writer.elasticsearchwriter.jest.PutMapping7;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

elasticsearchwriter/src/main/java/com/alibaba/datax/plugin/writer/elasticsearchwriter/ElasticSearchWriter.java

@@ -9,11 +9,11 @@
 import com.alibaba.datax.common.util.DataXCaseEnvUtil;
 import com.alibaba.datax.common.util.RetryUtil;
 import com.alibaba.datax.plugin.writer.elasticsearchwriter.Key.ActionType;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.TypeReference;
+import com.alibaba.fastjson2.JSONWriter;
 import com.google.common.base.Joiner;
 import io.searchbox.client.JestResult;
 import io.searchbox.core.*;
@@ -927,9 +927,8 @@ private void doBatchInsert(final List<Record> writerBuffer) {
                             Index.Builder builder = null;
                             if (this.enableWriteNull) {
                                 builder = new Index.Builder(
-                                        JSONObject.toJSONString(data, SerializerFeature.WriteMapNullValue,
-                                                SerializerFeature.QuoteFieldNames, SerializerFeature.SkipTransientField,
-                                                SerializerFeature.WriteEnumUsingToString, SerializerFeature.SortField));
+                                        JSONObject.toJSONString(data, JSONWriter.Feature.WriteMapNullValue,
+                                                JSONWriter.Feature.WriteEnumUsingToString));
                             } else {
                                 builder = new Index.Builder(JSONObject.toJSONString(data));
                             }
@@ -958,9 +957,8 @@ private void doBatchInsert(final List<Record> writerBuffer) {
                             if (this.enableWriteNull) {
                                 // write: {a:"1",b:null}
                             update = new Update.Builder(
-                                    JSONObject.toJSONString(updateDoc, SerializerFeature.WriteMapNullValue,
-                                            SerializerFeature.QuoteFieldNames, SerializerFeature.SkipTransientField,
-                                            SerializerFeature.WriteEnumUsingToString, SerializerFeature.SortField));
+                                    JSONObject.toJSONString(updateDoc, JSONWriter.Feature.WriteMapNullValue,
+                                            JSONWriter.Feature.WriteEnumUsingToString));
                             // 在DEFAULT_GENERATE_FEATURE基础上，只增加了SerializerFeature.WRITE_MAP_NULL_FEATURES
                             } else {
                                 // write: {"a":"1"}

elasticsearchwriter/src/main/java/com/alibaba/datax/plugin/writer/elasticsearchwriter/JsonPathUtil.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 
 public class JsonPathUtil {
 

elasticsearchwriter/src/main/java/com/alibaba/datax/plugin/writer/elasticsearchwriter/JsonUtil.java

@@ -1,8 +1,8 @@
 package com.alibaba.datax.plugin.writer.elasticsearchwriter;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONException;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONException;
+import com.alibaba.fastjson2.JSONObject;
 
 /**
  * @author bozu

elasticsearchwriter/src/main/java/com/alibaba/datax/plugin/writer/elasticsearchwriter/Key.java

@@ -1,8 +1,8 @@
 package com.alibaba.datax.plugin.writer.elasticsearchwriter;
 
 import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 
 import org.apache.commons.lang3.StringUtils;
 

ftpwriter/src/main/java/com/alibaba/datax/plugin/writer/ftpwriter/util/SftpHelperImpl.java

@@ -14,8 +14,8 @@
 
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.plugin.writer.ftpwriter.FtpWriterErrorCode;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONWriter;
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
@@ -251,7 +251,7 @@ public Set<String> getAllFilesInDir(String dir, String prefixFileName) {
             @SuppressWarnings("rawtypes")
             Vector allFiles = this.channelSftp.ls(dir);
             LOG.debug(String.format("ls: %s", JSON.toJSONString(allFiles,
-                    SerializerFeature.UseSingleQuotes)));
+                    JSONWriter.Feature.UseSingleQuotes)));
             for (int i = 0; i < allFiles.size(); i++) {
                 LsEntry le = (LsEntry) allFiles.get(i);
                 String strName = le.getFilename();

ftpwriter/src/main/java/com/alibaba/datax/plugin/writer/ftpwriter/util/StandardFtpHelperImpl.java

@@ -18,8 +18,8 @@
 
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.plugin.writer.ftpwriter.FtpWriterErrorCode;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONWriter;
 
 public class StandardFtpHelperImpl implements IFtpHelper {
     private static final Logger LOG = LoggerFactory
@@ -244,7 +244,7 @@ public Set<String> getAllFilesInDir(String dir, String prefixFileName) {
             FTPFile[] fs = this.ftpClient.listFiles(dir);
             // LOG.debug(JSON.toJSONString(this.ftpClient.listNames(dir)));
             LOG.debug(String.format("ls: %s",
-                    JSON.toJSONString(fs, SerializerFeature.UseSingleQuotes)));
+                    JSON.toJSONString(fs, JSONWriter.Feature.UseSingleQuotes)));
             for (FTPFile ff : fs) {
                 String strName = ff.getName();
                 if (strName.startsWith(prefixFileName)) {

gdbwriter/src/main/java/com/alibaba/datax/plugin/writer/gdbwriter/mapping/DefaultGdbMapper.java

@@ -19,8 +19,8 @@
 import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbEdge;
 import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbElement;
 import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbVertex;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 
 import lombok.extern.slf4j.Slf4j;
 

gdbwriter/src/main/java/com/alibaba/datax/plugin/writer/gdbwriter/util/ConfigHelper.java

@@ -12,8 +12,8 @@
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.common.util.Configuration;
 import com.alibaba.datax.plugin.writer.gdbwriter.GdbWriterErrorCode;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 
 /**
  * @author jerrywang

hbase094xreader/src/main/java/com/alibaba/datax/plugin/reader/hbase094xreader/Hbase094xHelper.java

@@ -2,8 +2,8 @@
 
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.hadoop.fs.Path;

hbase094xwriter/src/main/java/com/alibaba/datax/plugin/writer/hbase094xwriter/Hbase094xHelper.java

@@ -2,8 +2,8 @@
 
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.hadoop.fs.Path;

hbase11xreader/src/main/java/com/alibaba/datax/plugin/reader/hbase11xreader/Hbase11xHelper.java

@@ -2,8 +2,8 @@
 
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.hadoop.hbase.HBaseConfiguration;

hbase11xsqlreader/src/main/java/com/alibaba/datax/plugin/reader/hbase11xsqlreader/HbaseSQLHelper.java

@@ -2,8 +2,8 @@
 
 import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.mapreduce.InputSplit;