diff --git a/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java b/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java index c1705c9a..6ea8d4b2 100644 --- a/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java +++ b/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java @@ -6,8 +6,6 @@ import java.util.Map; import com.alibaba.excel.converters.bigdecimal.BigDecimalBooleanConverter; import com.alibaba.excel.converters.bigdecimal.BigDecimalNumberConverter; import com.alibaba.excel.converters.bigdecimal.BigDecimalStringConverter; -import com.alibaba.excel.converters.bigdecimal.BigIntegerBooleanConverter; -import com.alibaba.excel.converters.biginteger.BigIntegerNumberConverter; import com.alibaba.excel.converters.biginteger.BigIntegerStringConverter; import com.alibaba.excel.converters.booleanconverter.BooleanBooleanConverter; import com.alibaba.excel.converters.booleanconverter.BooleanNumberConverter; @@ -98,9 +96,7 @@ public class DefaultConverterLoader { putAllConverter(new StringStringConverter()); putAllConverter(new StringErrorConverter()); - putAllConverter(new BigIntegerBooleanConverter()); putAllConverter(new BigIntegerStringConverter()); - putAllConverter(new BigIntegerNumberConverter()); } private static void initDefaultWriteConverter() { diff --git a/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerBooleanConverter.java b/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerBooleanConverter.java deleted file mode 100644 index 1c69e853..00000000 --- a/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerBooleanConverter.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.alibaba.excel.converters.bigdecimal; - -import java.math.BigDecimal; -import java.math.BigInteger; - -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.CellData; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.property.ExcelContentProperty; - -/** - * BigDecimal and boolean converter - * - * @author Jiaju Zhuang - */ -public class BigIntegerBooleanConverter implements Converter { - - @Override - public Class supportJavaTypeKey() { - return BigInteger.class; - } - - @Override - public CellDataTypeEnum supportExcelTypeKey() { - return CellDataTypeEnum.BOOLEAN; - } - - @Override - public BigInteger convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - if (cellData.getBooleanValue()) { - return BigInteger.ONE; - } - return BigInteger.ZERO; - } - - @Override - public CellData convertToExcelData(BigInteger value, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - if (BigDecimal.ONE.equals(value)) { - return new CellData(Boolean.TRUE); - } - return new CellData(Boolean.FALSE); - } - -} diff --git a/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerNumberConverter.java b/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerNumberConverter.java deleted file mode 100644 index 293bb14a..00000000 --- a/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerNumberConverter.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.alibaba.excel.converters.biginteger; -import java.math.BigInteger; - -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.CellData; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.property.ExcelContentProperty; - -/** - * BigDecimal and number converter - * - * @author Jiaju Zhuang - */ -public class BigIntegerNumberConverter implements Converter { - - @Override - public Class supportJavaTypeKey() { - return BigInteger.class; - } - - @Override - public CellDataTypeEnum supportExcelTypeKey() { - return CellDataTypeEnum.NUMBER; - } - - @Override - public BigInteger convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - return cellData.getNumberValue().toBigInteger(); - } - - @Override - public CellData convertToExcelData(BigInteger value, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - return new CellData(value); - } -}