update fastjson version

This commit is contained in:
shaojin.wensj 2022-11-14 22:28:26 +08:00
parent 905e4d4dd9
commit 27964108aa
84 changed files with 153 additions and 165 deletions

View File

@ -18,7 +18,7 @@ import com.alibaba.datax.plugin.writer.adswriter.AdsWriterErrorCode;
import com.alibaba.datax.plugin.writer.adswriter.ads.TableInfo; 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.Constant;
import com.alibaba.datax.plugin.writer.adswriter.util.Key; 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.StringUtils;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

@ -23,7 +23,7 @@ import com.alibaba.datax.common.element.StringColumn;
import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.exception.DataXException;
import com.alibaba.datax.common.plugin.TaskPluginCollector; import com.alibaba.datax.common.plugin.TaskPluginCollector;
import com.alibaba.datax.common.util.Configuration; 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.Cluster;
import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.CodecRegistry;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -27,7 +27,7 @@ import com.alibaba.datax.core.util.container.ClassLoaderSwapper;
import com.alibaba.datax.core.util.container.CoreConstant; import com.alibaba.datax.core.util.container.CoreConstant;
import com.alibaba.datax.core.util.container.LoadUtil; import com.alibaba.datax.core.util.container.LoadUtil;
import com.alibaba.datax.dataxservice.face.domain.enums.ExecuteMode; 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.StringUtils;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

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

View File

@ -6,7 +6,7 @@ import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.core.statistics.communication.Communication; import com.alibaba.datax.core.statistics.communication.Communication;
import com.alibaba.datax.core.util.container.CoreConstant; import com.alibaba.datax.core.util.container.CoreConstant;
import com.alibaba.datax.core.statistics.plugin.task.util.DirtyRecord; 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.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

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

View File

@ -27,7 +27,7 @@ import com.alibaba.datax.core.util.TransformerUtil;
import com.alibaba.datax.core.util.container.CoreConstant; import com.alibaba.datax.core.util.container.CoreConstant;
import com.alibaba.datax.core.util.container.LoadUtil; import com.alibaba.datax.core.util.container.LoadUtil;
import com.alibaba.datax.dataxservice.face.domain.enums.State; 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.apache.commons.lang3.Validate;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

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

View File

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

View File

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

View File

@ -8,7 +8,7 @@ import com.alibaba.datax.common.spi.Writer;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.common.util.DataXCaseEnvUtil; import com.alibaba.datax.common.util.DataXCaseEnvUtil;
import com.alibaba.datax.common.util.RetryUtil; 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.DatahubClient;
import com.aliyun.datahub.client.model.FieldType; import com.aliyun.datahub.client.model.FieldType;
import com.aliyun.datahub.client.model.GetTopicResult; import com.aliyun.datahub.client.model.GetTopicResult;

View File

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

View File

@ -1,6 +1,6 @@
package com.alibaba.datax.plugin.writer.doriswriter; 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.commons.codec.binary.Base64;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.client.config.RequestConfig; import org.apache.http.client.config.RequestConfig;

View File

@ -5,8 +5,8 @@ import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.elasticsearchwriter.jest.ClusterInfo; 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.ClusterInfoResult;
import com.alibaba.datax.plugin.writer.elasticsearchwriter.jest.PutMapping7; import com.alibaba.datax.plugin.writer.elasticsearchwriter.jest.PutMapping7;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -19,8 +19,8 @@ import com.alibaba.datax.plugin.writer.gdbwriter.Key;
import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbEdge; 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.GdbElement;
import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbVertex; import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbVertex;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,8 +2,8 @@ package com.alibaba.datax.plugin.writer.hbase11xsqlwriter;
import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.exception.DataXException;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson2.TypeReference;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.Pair;

View File

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

View File

@ -8,8 +8,8 @@ import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.unstructuredstorage.reader.ColumnEntry; import com.alibaba.datax.plugin.unstructuredstorage.reader.ColumnEntry;
import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderErrorCode; import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderErrorCode;
import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderUtil; import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileStatus;

View File

@ -8,8 +8,8 @@ import com.alibaba.datax.common.plugin.TaskPluginCollector;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.unstructuredstorage.util.ColumnTypeUtil; import com.alibaba.datax.plugin.unstructuredstorage.util.ColumnTypeUtil;
import com.alibaba.datax.plugin.unstructuredstorage.util.HdfsUtil; import com.alibaba.datax.plugin.unstructuredstorage.util.HdfsUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;

View File

@ -15,8 +15,8 @@ import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
import com.alibaba.datax.plugin.writer.hologresjdbcwriter.util.ConfLoader; import com.alibaba.datax.plugin.writer.hologresjdbcwriter.util.ConfLoader;
import com.alibaba.datax.plugin.writer.hologresjdbcwriter.util.OriginalConfPretreatmentUtil; import com.alibaba.datax.plugin.writer.hologresjdbcwriter.util.OriginalConfPretreatmentUtil;
import com.alibaba.datax.plugin.writer.hologresjdbcwriter.util.WriterUtil; import com.alibaba.datax.plugin.writer.hologresjdbcwriter.util.WriterUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.alibaba.hologres.client.HoloClient; import com.alibaba.hologres.client.HoloClient;
import com.alibaba.hologres.client.HoloConfig; import com.alibaba.hologres.client.HoloConfig;
import com.alibaba.hologres.client.Put; import com.alibaba.hologres.client.Put;

View File

@ -3,7 +3,7 @@ package com.q1.datax.plugin.writer.kudu11xwriter;
import com.alibaba.datax.common.element.Column; import com.alibaba.datax.common.element.Column;
import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.exception.DataXException;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import org.apache.kudu.ColumnSchema; import org.apache.kudu.ColumnSchema;

View File

@ -8,7 +8,7 @@ import com.alibaba.datax.common.spi.Reader;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.common.util.DataXCaseEnvUtil; import com.alibaba.datax.common.util.DataXCaseEnvUtil;
import com.alibaba.datax.common.util.RetryUtil; import com.alibaba.datax.common.util.RetryUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.aliyun.openservices.log.Client; import com.aliyun.openservices.log.Client;
import com.aliyun.openservices.log.common.Consts.CursorMode; import com.aliyun.openservices.log.common.Consts.CursorMode;
import com.aliyun.openservices.log.common.*; import com.aliyun.openservices.log.common.*;

View File

@ -18,9 +18,9 @@ import com.alibaba.datax.common.spi.Reader;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.reader.mongodbreader.util.CollectionSplitUtil; import com.alibaba.datax.plugin.reader.mongodbreader.util.CollectionSplitUtil;
import com.alibaba.datax.plugin.reader.mongodbreader.util.MongoUtil; import com.alibaba.datax.plugin.reader.mongodbreader.util.MongoUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Strings; import com.google.common.base.Strings;

View File

@ -7,9 +7,9 @@ import com.alibaba.datax.common.spi.Writer;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.rdbms.writer.Key; import com.alibaba.datax.plugin.rdbms.writer.Key;
import com.alibaba.datax.plugin.writer.mongodbwriter.util.MongoUtil; import com.alibaba.datax.plugin.writer.mongodbwriter.util.MongoUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.mongodb.*; import com.mongodb.*;
import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCollection;

View File

@ -10,7 +10,7 @@ import com.alibaba.datax.plugin.rdbms.reader.Constant;
import com.alibaba.datax.plugin.reader.oceanbasev10reader.OceanBaseReader; import com.alibaba.datax.plugin.reader.oceanbasev10reader.OceanBaseReader;
import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.ObReaderUtils; import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.ObReaderUtils;
import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.PartitionSplitUtil; import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.PartitionSplitUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -12,7 +12,7 @@ import com.alibaba.datax.plugin.rdbms.writer.util.WriterUtil;
import com.alibaba.datax.plugin.writer.oceanbasev10writer.task.ConcurrentTableWriterTask; import com.alibaba.datax.plugin.writer.oceanbasev10writer.task.ConcurrentTableWriterTask;
import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.DbUtils; import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.DbUtils;
import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.ObWriterUtils; import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.ObWriterUtils;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -7,7 +7,7 @@ import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.common.util.FilterUtil; import com.alibaba.datax.common.util.FilterUtil;
import com.alibaba.datax.common.util.MessageSource; import com.alibaba.datax.common.util.MessageSource;
import com.alibaba.datax.plugin.reader.odpsreader.util.*; import com.alibaba.datax.plugin.reader.odpsreader.util.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.aliyun.odps.Column; import com.aliyun.odps.Column;
import com.aliyun.odps.Odps; import com.aliyun.odps.Odps;
import com.aliyun.odps.Table; import com.aliyun.odps.Table;

View File

@ -6,7 +6,7 @@ import com.alibaba.datax.common.plugin.RecordSender;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.common.util.MessageSource; import com.alibaba.datax.common.util.MessageSource;
import com.alibaba.datax.plugin.reader.odpsreader.util.OdpsUtil; import com.alibaba.datax.plugin.reader.odpsreader.util.OdpsUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.aliyun.odps.Column; import com.aliyun.odps.Column;
import com.aliyun.odps.OdpsType; import com.aliyun.odps.OdpsType;
import com.aliyun.odps.data.*; import com.aliyun.odps.data.*;
@ -200,7 +200,7 @@ public class ReaderProxy {
} }
if (IS_DEBUG) { if (IS_DEBUG) {
LOG.debug(String.format("partition value details: %s", LOG.debug(String.format("partition value details: %s",
com.alibaba.fastjson.JSON.toJSONString(partitionMap))); com.alibaba.fastjson2.JSON.toJSONString(partitionMap)));
} }
return partitionMap; return partitionMap;
} }
@ -212,7 +212,7 @@ public class ReaderProxy {
// it's will never happen, but add this checking // it's will never happen, but add this checking
if (!partitionMap.containsKey(partitionColumnName)) { if (!partitionMap.containsKey(partitionColumnName)) {
String errorMessage = MESSAGE_SOURCE.message("readerproxy.3", String errorMessage = MESSAGE_SOURCE.message("readerproxy.3",
com.alibaba.fastjson.JSON.toJSONString(partitionMap), com.alibaba.fastjson2.JSON.toJSONString(partitionMap),
partitionColumnName); partitionColumnName);
throw DataXException.asDataXException( throw DataXException.asDataXException(
OdpsReaderErrorCode.READ_DATA_FAIL, errorMessage); OdpsReaderErrorCode.READ_DATA_FAIL, errorMessage);

View File

@ -12,9 +12,9 @@ import com.alibaba.datax.common.util.MessageSource;
import com.alibaba.datax.plugin.writer.odpswriter.model.PartitionInfo; import com.alibaba.datax.plugin.writer.odpswriter.model.PartitionInfo;
import com.alibaba.datax.plugin.writer.odpswriter.model.UserDefinedFunction; import com.alibaba.datax.plugin.writer.odpswriter.model.UserDefinedFunction;
import com.alibaba.datax.plugin.writer.odpswriter.util.*; import com.alibaba.datax.plugin.writer.odpswriter.util.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.aliyun.odps.Odps; import com.aliyun.odps.Odps;
import com.aliyun.odps.Table; import com.aliyun.odps.Table;
import com.aliyun.odps.TableSchema; import com.aliyun.odps.TableSchema;

View File

@ -6,9 +6,9 @@ import com.alibaba.datax.common.plugin.TaskPluginCollector;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.common.util.MessageSource; import com.alibaba.datax.common.util.MessageSource;
import com.alibaba.datax.plugin.writer.odpswriter.util.OdpsUtil; import com.alibaba.datax.plugin.writer.odpswriter.util.OdpsUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.aliyun.odps.OdpsType; import com.aliyun.odps.OdpsType;
import com.aliyun.odps.TableSchema; import com.aliyun.odps.TableSchema;
import com.aliyun.odps.data.ArrayRecord; import com.aliyun.odps.data.ArrayRecord;

View File

@ -4,7 +4,7 @@ import com.alibaba.datax.common.element.Record;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.odpswriter.model.PartitionInfo; import com.alibaba.datax.plugin.writer.odpswriter.model.PartitionInfo;
import com.alibaba.datax.plugin.writer.odpswriter.model.UserDefinedFunction; import com.alibaba.datax.plugin.writer.odpswriter.model.UserDefinedFunction;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

@ -44,10 +44,6 @@
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
<exclusion> <exclusion>
<artifactId>commons-math3</artifactId> <artifactId>commons-math3</artifactId>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@ -89,8 +85,8 @@
<!-- json --> <!-- json -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson2</artifactId>
</dependency> </dependency>
<!-- opentsdb --> <!-- opentsdb -->

View File

@ -1,6 +1,6 @@
package com.alibaba.datax.plugin.reader.conn; package com.alibaba.datax.plugin.reader.conn;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import java.util.Map; import java.util.Map;

View File

@ -2,7 +2,7 @@ package com.alibaba.datax.plugin.reader.conn;
import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.plugin.RecordSender;
import com.alibaba.datax.plugin.reader.util.TSDBUtils; import com.alibaba.datax.plugin.reader.util.TSDBUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.List;

View File

@ -1,7 +1,7 @@
package com.alibaba.datax.plugin.reader.conn; package com.alibaba.datax.plugin.reader.conn;
import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.plugin.RecordSender;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import net.opentsdb.core.TSDB; import net.opentsdb.core.TSDB;
import net.opentsdb.utils.Config; import net.opentsdb.utils.Config;

View File

@ -6,7 +6,7 @@ import com.alibaba.datax.common.spi.Reader;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.reader.conn.OpenTSDBConnection; import com.alibaba.datax.plugin.reader.conn.OpenTSDBConnection;
import com.alibaba.datax.plugin.reader.util.TimeUtils; import com.alibaba.datax.plugin.reader.util.TimeUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

@ -1,6 +1,6 @@
package com.alibaba.datax.plugin.reader.util; package com.alibaba.datax.plugin.reader.util;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.http.client.fluent.Content; import org.apache.http.client.fluent.Content;
import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Request;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;

View File

@ -1,7 +1,7 @@
package com.alibaba.datax.plugin.reader.util; package com.alibaba.datax.plugin.reader.util;
import com.alibaba.datax.plugin.reader.conn.DataPoint4TSDB; import com.alibaba.datax.plugin.reader.conn.DataPoint4TSDB;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -12,8 +12,8 @@ import com.alibaba.datax.plugin.unstructuredstorage.FileFormat;
import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderUtil; import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderUtil;
import com.alibaba.datax.plugin.unstructuredstorage.reader.binaryFileUtil.BinaryFileReaderUtil; import com.alibaba.datax.plugin.unstructuredstorage.reader.binaryFileUtil.BinaryFileReaderUtil;
import com.alibaba.datax.plugin.unstructuredstorage.reader.split.StartEndPair; import com.alibaba.datax.plugin.unstructuredstorage.reader.split.StartEndPair;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson2.TypeReference;
import com.aliyun.oss.ClientException; import com.aliyun.oss.ClientException;
import com.aliyun.oss.OSSClient; import com.aliyun.oss.OSSClient;
import com.aliyun.oss.OSSException; import com.aliyun.oss.OSSException;

View File

@ -2,8 +2,8 @@ package com.alibaba.datax.plugin.reader.ossreader.util;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.reader.ossreader.Key; import com.alibaba.datax.plugin.reader.ossreader.Key;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
/** /**
* @Author: guxuan * @Author: guxuan

View File

@ -7,8 +7,8 @@ import com.alibaba.datax.plugin.unstructuredstorage.reader.Key;
import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderErrorCode; import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderErrorCode;
import com.alibaba.datax.plugin.unstructuredstorage.reader.split.StartEndPair; import com.alibaba.datax.plugin.unstructuredstorage.reader.split.StartEndPair;
import com.alibaba.datax.plugin.unstructuredstorage.reader.split.UnstructuredSplitUtil; import com.alibaba.datax.plugin.unstructuredstorage.reader.split.UnstructuredSplitUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.aliyun.oss.OSSClient; import com.aliyun.oss.OSSClient;
import com.aliyun.oss.model.GetObjectRequest; import com.aliyun.oss.model.GetObjectRequest;
import com.aliyun.oss.model.OSSObject; import com.aliyun.oss.model.OSSObject;

View File

@ -14,7 +14,7 @@ import com.alibaba.datax.plugin.unstructuredstorage.writer.binaryFileUtil.Binary
import com.alibaba.datax.plugin.writer.hdfswriter.HdfsWriter; import com.alibaba.datax.plugin.writer.hdfswriter.HdfsWriter;
import com.alibaba.datax.plugin.writer.osswriter.util.HandlerUtil; import com.alibaba.datax.plugin.writer.osswriter.util.HandlerUtil;
import com.alibaba.datax.plugin.writer.osswriter.util.HdfsParquetUtil; import com.alibaba.datax.plugin.writer.osswriter.util.HdfsParquetUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.aliyun.oss.model.*; import com.aliyun.oss.model.*;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

View File

@ -5,9 +5,9 @@ import com.alibaba.datax.common.element.Record;
import com.alibaba.datax.common.plugin.TaskPluginCollector; import com.alibaba.datax.common.plugin.TaskPluginCollector;
import com.alibaba.datax.plugin.unstructuredstorage.writer.Key; import com.alibaba.datax.plugin.unstructuredstorage.writer.Key;
import com.alibaba.datax.plugin.writer.osswriter.Constant; import com.alibaba.datax.plugin.writer.osswriter.Constant;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

@ -3,8 +3,8 @@ package com.alibaba.datax.plugin.writer.osswriter.util;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.hdfswriter.HdfsWriter; import com.alibaba.datax.plugin.writer.hdfswriter.HdfsWriter;
import com.alibaba.datax.plugin.writer.osswriter.Key; import com.alibaba.datax.plugin.writer.osswriter.Key;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;

View File

@ -5,7 +5,7 @@ import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.rdbms.reader.Constant; import com.alibaba.datax.plugin.rdbms.reader.Constant;
import com.alibaba.datax.plugin.rdbms.reader.Key; import com.alibaba.datax.plugin.rdbms.reader.Key;
import com.alibaba.datax.plugin.rdbms.util.*; import com.alibaba.datax.plugin.rdbms.util.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;

View File

@ -5,7 +5,7 @@ import java.text.SimpleDateFormat;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
public class ColumnEntry { public class ColumnEntry {
private Integer index; private Integer index;

View File

@ -5,9 +5,9 @@ import com.alibaba.datax.common.exception.DataXException;
import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.plugin.RecordSender;
import com.alibaba.datax.common.plugin.TaskPluginCollector; import com.alibaba.datax.common.plugin.TaskPluginCollector;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson2.TypeReference;
import com.csvreader.CsvReader; import com.csvreader.CsvReader;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import io.airlift.compress.snappy.SnappyCodec; import io.airlift.compress.snappy.SnappyCodec;

View File

@ -5,7 +5,7 @@ import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.common.util.RangeSplitUtil; import com.alibaba.datax.common.util.RangeSplitUtil;
import com.alibaba.datax.plugin.unstructuredstorage.reader.Key; import com.alibaba.datax.plugin.unstructuredstorage.reader.Key;
import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderErrorCode; import com.alibaba.datax.plugin.unstructuredstorage.reader.UnstructuredStorageReaderErrorCode;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.ImmutableTriple;
import org.apache.commons.lang3.tuple.Triple; import org.apache.commons.lang3.tuple.Triple;

View File

@ -2,8 +2,8 @@ package com.alibaba.datax.plugin.unstructuredstorage.util;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.unstructuredstorage.reader.ColumnEntry; import com.alibaba.datax.plugin.unstructuredstorage.reader.ColumnEntry;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -6,8 +6,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson2.TypeReference;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

View File

@ -22,7 +22,7 @@
<commons-lang3-version>3.3.2</commons-lang3-version> <commons-lang3-version>3.3.2</commons-lang3-version>
<commons-configuration-version>1.10</commons-configuration-version> <commons-configuration-version>1.10</commons-configuration-version>
<commons-cli-version>1.2</commons-cli-version> <commons-cli-version>1.2</commons-cli-version>
<fastjson-version>1.1.46.sec10</fastjson-version> <fastjson-version>2.0.19</fastjson-version>
<guava-version>16.0.1</guava-version> <guava-version>16.0.1</guava-version>
<diamond.version>3.7.2.1-SNAPSHOT</diamond.version> <diamond.version>3.7.2.1-SNAPSHOT</diamond.version>
@ -135,8 +135,8 @@
<version>${commons-lang3-version}</version> <version>${commons-lang3-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson2</artifactId>
<version>${fastjson-version}</version> <version>${fastjson-version}</version>
</dependency> </dependency>
<!--<dependency> <!--<dependency>

View File

@ -62,9 +62,9 @@
<version>4.5.3</version> <version>4.5.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson2</artifactId>
<version>1.2.75</version> <version>2.0.15</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>

View File

@ -6,7 +6,7 @@ import java.net.URL;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.starrocks.connector.datax.plugin.writer.starrockswriter.StarRocksWriterOptions; import com.starrocks.connector.datax.plugin.writer.starrockswriter.StarRocksWriterOptions;
import com.starrocks.connector.datax.plugin.writer.starrockswriter.row.StarRocksDelimiterParser; import com.starrocks.connector.datax.plugin.writer.starrockswriter.row.StarRocksDelimiterParser;

View File

@ -5,7 +5,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.alibaba.datax.common.element.Record; import com.alibaba.datax.common.element.Record;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
public class StarRocksJsonSerializer extends StarRocksBaseSerializer implements StarRocksISerializer { public class StarRocksJsonSerializer extends StarRocksBaseSerializer implements StarRocksISerializer {

View File

@ -5,7 +5,7 @@ import com.alibaba.datax.common.exception.DataXException;
import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.plugin.RecordSender;
import com.alibaba.datax.common.spi.Reader; import com.alibaba.datax.common.spi.Reader;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.RandomUtils;

View File

@ -41,10 +41,6 @@
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
<exclusion> <exclusion>
<artifactId>commons-math3</artifactId> <artifactId>commons-math3</artifactId>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@ -86,8 +82,8 @@
<!-- json --> <!-- json -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson2</artifactId>
</dependency> </dependency>
<!-- time --> <!-- time -->

View File

@ -6,7 +6,7 @@ import com.alibaba.datax.common.spi.Reader;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.reader.tsdbreader.conn.TSDBConnection; import com.alibaba.datax.plugin.reader.tsdbreader.conn.TSDBConnection;
import com.alibaba.datax.plugin.reader.tsdbreader.util.TimeUtils; import com.alibaba.datax.plugin.reader.tsdbreader.util.TimeUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

@ -1,6 +1,6 @@
package com.alibaba.datax.plugin.reader.tsdbreader.conn; package com.alibaba.datax.plugin.reader.tsdbreader.conn;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import java.util.Map; import java.util.Map;

View File

@ -1,6 +1,6 @@
package com.alibaba.datax.plugin.reader.tsdbreader.conn; package com.alibaba.datax.plugin.reader.tsdbreader.conn;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import java.util.Map; import java.util.Map;

View File

@ -2,7 +2,7 @@ package com.alibaba.datax.plugin.reader.tsdbreader.conn;
import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.plugin.RecordSender;
import com.alibaba.datax.plugin.reader.tsdbreader.util.TSDBUtils; import com.alibaba.datax.plugin.reader.tsdbreader.util.TSDBUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.List;

View File

@ -4,8 +4,10 @@ import com.alibaba.datax.common.element.*;
import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.plugin.RecordSender;
import com.alibaba.datax.plugin.reader.tsdbreader.Constant; import com.alibaba.datax.plugin.reader.tsdbreader.Constant;
import com.alibaba.datax.plugin.reader.tsdbreader.util.HttpUtils; import com.alibaba.datax.plugin.reader.tsdbreader.util.HttpUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson2.JSONReader;
import com.alibaba.fastjson2.JSONReader.Feature;
import com.alibaba.fastjson2.JSONWriter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -29,7 +31,7 @@ final class TSDBDump {
private static final String QUERY_MULTI_FIELD = "/api/mquery"; private static final String QUERY_MULTI_FIELD = "/api/mquery";
static { static {
JSON.DEFAULT_PARSER_FEATURE &= ~Feature.UseBigDecimal.getMask(); JSON.config(Feature.UseBigDecimalForDoubles);
} }
private TSDBDump() { private TSDBDump() {

View File

@ -1,6 +1,6 @@
package com.alibaba.datax.plugin.reader.tsdbreader.util; package com.alibaba.datax.plugin.reader.tsdbreader.util;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.fluent.Content; import org.apache.http.client.fluent.Content;
import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Request;

View File

@ -38,10 +38,6 @@
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
<exclusion> <exclusion>
<artifactId>commons-math3</artifactId> <artifactId>commons-math3</artifactId>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@ -83,8 +79,8 @@
<!-- json --> <!-- json -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson2</artifactId>
</dependency> </dependency>
<!-- tsdb --> <!-- tsdb -->

View File

@ -1,6 +1,6 @@
package com.alibaba.datax.plugin.writer.conn; package com.alibaba.datax.plugin.writer.conn;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import java.util.Map; import java.util.Map;

View File

@ -2,7 +2,7 @@ package com.alibaba.datax.plugin.writer.conn;
import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.plugin.RecordSender;
import com.alibaba.datax.plugin.writer.util.TSDBUtils; import com.alibaba.datax.plugin.writer.util.TSDBUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.List;

View File

@ -2,7 +2,7 @@ package com.alibaba.datax.plugin.writer.tsdbwriter;
import com.alibaba.datax.common.element.Column; import com.alibaba.datax.common.element.Column;
import com.alibaba.datax.common.element.Record; import com.alibaba.datax.common.element.Record;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.aliyun.hitsdb.client.value.request.MultiFieldPoint; import com.aliyun.hitsdb.client.value.request.MultiFieldPoint;
import com.aliyun.hitsdb.client.value.request.Point; import com.aliyun.hitsdb.client.value.request.Point;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

@ -1,6 +1,6 @@
package com.alibaba.datax.plugin.writer.util; package com.alibaba.datax.plugin.writer.util;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.fluent.Content; import org.apache.http.client.fluent.Content;
import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Request;

View File

@ -1,7 +1,7 @@
package com.alibaba.datax.plugin.writer.util; package com.alibaba.datax.plugin.writer.util;
import com.alibaba.datax.plugin.writer.conn.DataPoint4TSDB; import com.alibaba.datax.plugin.writer.conn.DataPoint4TSDB;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;