add class

hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java

@@ -3,6 +3,8 @@ package cn.hutool.core.convert;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.impl.ArrayConverter;
 import cn.hutool.core.convert.impl.AtomicBooleanConverter;
+import cn.hutool.core.convert.impl.AtomicIntegerArrayConverter;
+import cn.hutool.core.convert.impl.AtomicLongArrayConverter;
 import cn.hutool.core.convert.impl.AtomicReferenceConverter;
 import cn.hutool.core.convert.impl.BeanConverter;
 import cn.hutool.core.convert.impl.BooleanConverter;
@@ -69,7 +71,9 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicIntegerArray;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicLongArray;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -423,6 +427,10 @@ public class ConverterRegistry implements Serializable {
 		defaultConverterMap.put(SoftReference.class, new ReferenceConverter(SoftReference.class));// since 3.0.8
 		defaultConverterMap.put(AtomicReference.class, new AtomicReferenceConverter());// since 3.0.8
 
+		//AtomicXXXArray，since 5.4.5
+		defaultConverterMap.put(AtomicIntegerArray.class, new AtomicIntegerArrayConverter());
+		defaultConverterMap.put(AtomicLongArray.class, new AtomicLongArrayConverter());
+
 		// 其它类型
 		defaultConverterMap.put(Class.class, new ClassConverter());
 		defaultConverterMap.put(TimeZone.class, new TimeZoneConverter());

hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicIntegerArrayConverter.java

@@ -0,0 +1,22 @@
+package cn.hutool.core.convert.impl;
+
+import cn.hutool.core.convert.AbstractConverter;
+import cn.hutool.core.convert.Convert;
+
+import java.util.concurrent.atomic.AtomicIntegerArray;
+
+/**
+ * {@link AtomicIntegerArray}转换器
+ * 
+ * @author Looly
+ * @since 5.4.5
+ */
+public class AtomicIntegerArrayConverter extends AbstractConverter<AtomicIntegerArray> {
+	private static final long serialVersionUID = 1L;
+
+	@Override
+	protected AtomicIntegerArray convertInternal(Object value) {
+		return new AtomicIntegerArray(Convert.convert(int[].class, value));
+	}
+
+}

hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicLongArrayConverter.java

@@ -0,0 +1,22 @@
+package cn.hutool.core.convert.impl;
+
+import cn.hutool.core.convert.AbstractConverter;
+import cn.hutool.core.convert.Convert;
+
+import java.util.concurrent.atomic.AtomicLongArray;
+
+/**
+ * {@link AtomicLongArray}转换器
+ * 
+ * @author Looly
+ * @since 5.4.5
+ */
+public class AtomicLongArrayConverter extends AbstractConverter<AtomicLongArray> {
+	private static final long serialVersionUID = 1L;
+
+	@Override
+	protected AtomicLongArray convertInternal(Object value) {
+		return new AtomicLongArray(Convert.convert(long[].class, value));
+	}
+
+}

hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java

@@ -13,6 +13,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.DoubleAdder;
+import java.util.concurrent.atomic.LongAdder;
 
 /**
  * 数字转换器<br>
@@ -64,7 +66,6 @@ public class NumberConverter extends AbstractConverter<Number> {
 			}
 			final String valueStr = convertToStr(value);
 			return StrUtil.isBlank(valueStr) ? null : Byte.valueOf(valueStr);
-
 		} else if (Short.class == targetType) {
 			if (value instanceof Number) {
 				return ((Number) value).shortValue();
@@ -73,7 +74,6 @@ public class NumberConverter extends AbstractConverter<Number> {
 			}
 			final String valueStr = convertToStr(value);
 			return StrUtil.isBlank(valueStr) ? null : Short.valueOf(valueStr);
-
 		} else if (Integer.class == targetType) {
 			if (value instanceof Number) {
 				return ((Number) value).intValue();
@@ -88,7 +88,6 @@ public class NumberConverter extends AbstractConverter<Number> {
 			}
 			final String valueStr = convertToStr(value);
 			return StrUtil.isBlank(valueStr) ? null : NumberUtil.parseInt(valueStr);
-
 		} else if (AtomicInteger.class == targetType) {
 			final Number number = convertInternal(value, Integer.class);
 			if (null != number) {
@@ -96,7 +95,6 @@ public class NumberConverter extends AbstractConverter<Number> {
 				intValue.set(number.intValue());
 				return intValue;
 			}
-			return null;
 		} else if (Long.class == targetType) {
 			if (value instanceof Number) {
 				return ((Number) value).longValue();
@@ -111,7 +109,6 @@ public class NumberConverter extends AbstractConverter<Number> {
 			}
 			final String valueStr = convertToStr(value);
 			return StrUtil.isBlank(valueStr) ? null : NumberUtil.parseLong(valueStr);
-
 		} else if (AtomicLong.class == targetType) {
 			final Number number = convertInternal(value, Long.class);
 			if (null != number) {
@@ -119,7 +116,14 @@ public class NumberConverter extends AbstractConverter<Number> {
 				longValue.set(number.longValue());
 				return longValue;
 			}
-			return null;
+		}else if (LongAdder.class == targetType) {
+			//jdk8 新增
+			final Number number = convertInternal(value, Long.class);
+			if (null != number) {
+				final LongAdder longValue = new LongAdder();
+				longValue.add(number.longValue());
+				return longValue;
+			}
 		} else if (Float.class == targetType) {
 			if (value instanceof Number) {
 				return ((Number) value).floatValue();
@@ -137,13 +141,18 @@ public class NumberConverter extends AbstractConverter<Number> {
 			}
 			final String valueStr = convertToStr(value);
 			return StrUtil.isBlank(valueStr) ? null : Double.valueOf(valueStr);
-
+		}else if (DoubleAdder.class == targetType) {
+			//jdk8 新增
+			final Number number = convertInternal(value, Long.class);
+			if (null != number) {
+				final DoubleAdder doubleAdder = new DoubleAdder();
+				doubleAdder.add(number.doubleValue());
+				return doubleAdder;
+			}
 		} else if (BigDecimal.class == targetType) {
 			return toBigDecimal(value);
-
 		} else if (BigInteger.class == targetType) {
 			return toBigInteger(value);
-
 		} else if (Number.class == targetType) {
 			if (value instanceof Number) {
 				return (Number) value;
@@ -166,22 +175,14 @@ public class NumberConverter extends AbstractConverter<Number> {
 	 * @return 结果
 	 */
 	private BigDecimal toBigDecimal(Object value) {
-		if (value instanceof Long) {
-			return new BigDecimal((Long) value);
-		} else if (value instanceof Integer) {
-			return new BigDecimal((Integer) value);
-		} else if (value instanceof BigInteger) {
-			return new BigDecimal((BigInteger) value);
+		if (value instanceof Number) {
+			return NumberUtil.toBigDecimal((Number) value);
 		} else if (value instanceof Boolean) {
 			return new BigDecimal((boolean) value ? 1 : 0);
 		}
 
 		//对于Double类型，先要转换为String，避免精度问题
-		final String valueStr = convertToStr(value);
-		if (StrUtil.isBlank(valueStr)) {
-			return null;
-		}
-		return new BigDecimal(valueStr);
+		return NumberUtil.toBigDecimal(convertToStr(value));
 	}
 
 	/**
@@ -198,11 +199,8 @@ public class NumberConverter extends AbstractConverter<Number> {
 		} else if (value instanceof Boolean) {
 			return BigInteger.valueOf((boolean) value ? 1 : 0);
 		}
-		final String valueStr = convertToStr(value);
-		if (StrUtil.isBlank(valueStr)) {
-			return null;
-		}
-		return new BigInteger(valueStr);
+
+		return NumberUtil.toBigInteger(convertToStr(value));
 	}
 
 	@Override

hutool-core/src/main/java/cn/hutool/core/convert/impl/StringConverter.java

@@ -1,18 +1,77 @@
 package cn.hutool.core.convert.impl;
 
 import cn.hutool.core.convert.AbstractConverter;
+import cn.hutool.core.convert.ConvertException;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.XmlUtil;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.SQLException;
+import java.util.TimeZone;
 
 /**
- * 字符串转换器
- * @author Looly
+ * 字符串转换器，提供各种对象转换为字符串的逻辑封装
  *
+ * @author Looly
  */
-public class StringConverter extends AbstractConverter<String>{
+public class StringConverter extends AbstractConverter<String> {
 	private static final long serialVersionUID = 1L;
 
 	@Override
 	protected String convertInternal(Object value) {
+		if (value instanceof TimeZone) {
+			return ((TimeZone) value).getID();
+		} else if (value instanceof org.w3c.dom.Node) {
+			return XmlUtil.toStr((org.w3c.dom.Node) value);
+		} else if (value instanceof Clob) {
+			return clobToStr((Clob) value);
+		} else if (value instanceof Blob) {
+			return blobToStr((Blob) value);
+		}
+
+		// 其它情况
 		return convertToStr(value);
 	}
 
+	/**
+	 * Clob字段值转字符串
+	 *
+	 * @param clob {@link Clob}
+	 * @return 字符串
+	 * @since 5.4.5
+	 */
+	private static String clobToStr(Clob clob) {
+		Reader reader = null;
+		try {
+			reader = clob.getCharacterStream();
+			return IoUtil.read(reader);
+		} catch (SQLException e) {
+			throw new ConvertException(e);
+		} finally {
+			IoUtil.close(reader);
+		}
+	}
+
+	/**
+	 * Blob字段值转字符串
+	 *
+	 * @param blob    {@link Blob}
+	 * @return 字符串
+	 * @since 5.4.5
+	 */
+	private static String blobToStr(Blob blob) {
+		InputStream in = null;
+		try {
+			in = blob.getBinaryStream();
+			return IoUtil.read(in, CharsetUtil.CHARSET_UTF_8);
+		} catch (SQLException e) {
+			throw new ConvertException(e);
+		} finally {
+			IoUtil.close(in);
+		}
+	}
 }

hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java

@@ -2005,6 +2005,17 @@ public class NumberUtil {
 		if (null == number) {
 			return BigDecimal.ZERO;
 		}
+
+		if(number instanceof BigDecimal){
+			return (BigDecimal) number;
+		} else if (number instanceof Long) {
+			return new BigDecimal((Long) number);
+		} else if (number instanceof Integer) {
+			return new BigDecimal((Integer) number);
+		} else if (number instanceof BigInteger) {
+			return new BigDecimal((BigInteger) number);
+		}
+
 		return toBigDecimal(number.toString());
 	}
 
@@ -2019,6 +2030,38 @@ public class NumberUtil {
 		return (null == number) ? BigDecimal.ZERO : new BigDecimal(number);
 	}
 
+	/**
+	 * 数字转{@link BigInteger}
+	 *
+	 * @param number 数字
+	 * @return {@link BigInteger}
+	 * @since 5.4.5
+	 */
+	public static BigInteger toBigInteger(Number number) {
+		if (null == number) {
+			return BigInteger.ZERO;
+		}
+
+		if(number instanceof BigInteger){
+			return (BigInteger) number;
+		} else if (number instanceof Long) {
+			return BigInteger.valueOf((Long) number);
+		}
+
+		return toBigInteger(number.longValue());
+	}
+
+	/**
+	 * 数字转{@link BigInteger}
+	 *
+	 * @param number 数字
+	 * @return {@link BigInteger}
+	 * @since 5.4.5
+	 */
+	public static BigInteger toBigInteger(String number) {
+		return (null == number) ? BigInteger.ZERO : new BigInteger(number);
+	}
+
 	/**
 	 * 是否空白符<br>
 	 * 空白符包括空格、制表符、全角空格和不间断空格<br>

hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java

@@ -345,6 +345,19 @@ public class XmlUtil {
 
 	// -------------------------------------------------------------------------------------- Write
 
+	/**
+	 * 将XML文档转换为String<br>
+	 * 字符编码使用XML文档中的编码，获取不到则使用UTF-8<br>
+	 * 默认非格式化输出，若想格式化请使用{@link #format(Document)}
+	 *
+	 * @param doc XML文档
+	 * @return XML字符串
+	 * @since 5.4.5
+	 */
+	public static String toStr(Node doc) {
+		return toStr(doc, false);
+	}
+
 	/**
 	 * 将XML文档转换为String<br>
 	 * 字符编码使用XML文档中的编码，获取不到则使用UTF-8<br>
@@ -354,7 +367,20 @@ public class XmlUtil {
 	 * @return XML字符串
 	 */
 	public static String toStr(Document doc) {
-		return toStr(doc, false);
+		return toStr((Node)doc);
+	}
+
+	/**
+	 * 将XML文档转换为String<br>
+	 * 字符编码使用XML文档中的编码，获取不到则使用UTF-8
+	 *
+	 * @param doc      XML文档
+	 * @param isPretty 是否格式化输出
+	 * @return XML字符串
+	 * @since 5.4.5
+	 */
+	public static String toStr(Node doc, boolean isPretty) {
+		return toStr(doc, CharsetUtil.UTF_8, isPretty);
 	}
 
 	/**
@@ -367,7 +393,21 @@ public class XmlUtil {
 	 * @since 3.0.9
 	 */
 	public static String toStr(Document doc, boolean isPretty) {
-		return toStr(doc, CharsetUtil.UTF_8, isPretty);
+		return toStr((Node)doc, isPretty);
+	}
+
+	/**
+	 * 将XML文档转换为String<br>
+	 * 字符编码使用XML文档中的编码，获取不到则使用UTF-8
+	 *
+	 * @param doc      XML文档
+	 * @param charset  编码
+	 * @param isPretty 是否格式化输出
+	 * @return XML字符串
+	 * @since 5.4.5
+	 */
+	public static String toStr(Node doc, String charset, boolean isPretty) {
+		return toStr(doc, charset, isPretty, false);
 	}
 
 	/**
@@ -381,7 +421,7 @@ public class XmlUtil {
 	 * @since 3.0.9
 	 */
 	public static String toStr(Document doc, String charset, boolean isPretty) {
-		return toStr(doc, charset, isPretty, false);
+		return toStr((Node)doc, charset, isPretty);
 	}
 
 	/**
@@ -395,7 +435,7 @@ public class XmlUtil {
 	 * @return XML字符串
 	 * @since 5.1.2
 	 */
-	public static String toStr(Document doc, String charset, boolean isPretty, boolean omitXmlDeclaration) {
+	public static String toStr(Node doc, String charset, boolean isPretty, boolean omitXmlDeclaration) {
 		final StringWriter writer = StrUtil.getWriter();
 		try {
 			write(doc, writer, charset, isPretty ? INDENT_DEFAULT : 0, omitXmlDeclaration);

hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java

@@ -9,6 +9,8 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicIntegerArray;
+import java.util.concurrent.atomic.AtomicLongArray;
 
 /**
  * 类型转换工具单元测试
@@ -222,6 +224,20 @@ public class ConvertTest {
 		Assert.assertEquals("5.1.1", product.getVersion());
 	}
 
+	@Test
+	public void toAtomicIntegerArrayTest(){
+		String str = "1,2";
+		final AtomicIntegerArray atomicIntegerArray = Convert.convert(AtomicIntegerArray.class, str);
+		Assert.assertEquals("[1, 2]", atomicIntegerArray.toString());
+	}
+
+	@Test
+	public void toAtomicLongArrayTest(){
+		String str = "1,2";
+		final AtomicLongArray atomicLongArray = Convert.convert(AtomicLongArray.class, str);
+		Assert.assertEquals("[1, 2]", atomicLongArray.toString());
+	}
+
 	@Data
 	@AllArgsConstructor
 	public static class Product implements Serializable {

hutool-core/src/test/java/cn/hutool/core/convert/StringConvertTest.java

@@ -0,0 +1,15 @@
+package cn.hutool.core.convert;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.TimeZone;
+
+public class StringConvertTest {
+
+	@Test
+	public void timezoneToStrTest(){
+		final String s = Convert.toStr(TimeZone.getTimeZone("Asia/Shanghai"));
+		Assert.assertEquals("Asia/Shanghai", s);
+	}
+}