fix(bean): 修复FastBeanCopier对CharSequence属性的复制支持

Author: zhou-hao

hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java

@@ -587,7 +587,7 @@ public <T> T convert(Object source, Class<T> targetClass, Class[] genericType) {
                     return convert(val, targetClass, genericType);
                 }
             }
-            if (targetClass == String.class) {
+            if (targetClass == String.class || targetClass == CharSequence.class) {
                 if (source instanceof Date) {
                     // TODO: 18-4-16 自定义格式
                     return (T) DateFormatter.toString(((Date) source), "yyyy-MM-dd HH:mm:ss");

hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java

@@ -161,6 +161,18 @@ public void testMapList() {
 
     }
 
+    @Test
+    public void testCharSequence() {
+        CharSequenceTarget beanTarget = FastBeanCopier.copy(new CharSequenceSource("test"), new CharSequenceTarget());
+        Assert.assertEquals("test", String.valueOf(beanTarget.getValue()));
+
+        Map<String, Object> source = new HashMap<>();
+        source.put("value", 123);
+
+        CharSequenceTarget mapTarget = FastBeanCopier.copy(source, new CharSequenceTarget());
+        Assert.assertEquals("123", String.valueOf(mapTarget.getValue()));
+    }
+
     @Getter
     @Setter
     public static class Config {
@@ -178,6 +190,22 @@ public String toString() {
         }
     }
 
+    @Getter
+    @Setter
+    public static class CharSequenceSource {
+        private String value;
+
+        public CharSequenceSource(String value) {
+            this.value = value;
+        }
+    }
+
+    @Getter
+    @Setter
+    public static class CharSequenceTarget {
+        private CharSequence value;
+    }
+
     @Test
     public void testCopyMap() {
 
@@ -337,4 +365,4 @@ public static class ExtendableSuper extends DefaultExtendable {
     public static class ExtendableExtends extends ExtendableSuper {
         private String name;
     }
-}
+}