一顿狂修改 castors

src/org/nutz/castor/Castor.java

@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -21,8 +22,28 @@
 public abstract class Castor<FROM, TO> {
 
     protected Castor() {
-        fromClass = (Class<?>) Mirror.getTypeParams(getClass())[0];
-        toClass = (Class<?>) Mirror.getTypeParams(getClass())[1];
+        Class<?> myType = getClass();
+        Class<?> mySuper = myType.getSuperclass();
+
+        Type[] myParams = Mirror.getTypeParams(myType);
+        Type[] superParams = Mirror.getTypeParams(mySuper);
+
+        if (null != superParams && superParams.length == 2) {
+            Class<?>[] args = new Class<?>[2];
+            int n = 0;
+            for (int i = 0; i < superParams.length; i++) {
+                if (superParams[i] instanceof Class<?>)
+                    args[i] = (Class<?>) superParams[i];
+                else
+                    args[i] = (Class<?>) myParams[n++];
+            }
+            fromClass = args[0];
+            toClass = args[1];
+        } else {
+            fromClass = (Class<?>) myParams[0];
+            toClass = (Class<?>) myParams[1];
+        }
+
     }
 
     protected Class<?> fromClass;
@@ -56,29 +77,29 @@ protected static Collection<?> createCollection(Object src, Class<?> toType)
                 }
             }
             if (null == coll)
-                throw new FailToCastObjectException(String.format(    "Castors don't know how to implement '%s'",
-                                                                    toType.getName()),
+                throw new FailToCastObjectException(String.format("Castors don't know how to implement '%s'",
+                                                                  toType.getName()),
                                                     Lang.unwrapThrow(e));
         }
         return coll;
     }
-    
+
     public int hashCode() {
         return toString().hashCode();
     }
-    
+
     public boolean equals(Object obj) {
-        if(!(obj instanceof Castor)){
+        if (!(obj instanceof Castor)) {
             return false;
         }
         Castor<?, ?> castor = (Castor<?, ?>) obj;
         return toString().equals(castor.toString());
     }
-    
+
     public String toString() {
         return fromClass.getName() + "2" + toClass.getName();
     }
-    
+
     public static final String key(Class<?> fromClass, Class<?> toClass) {
         return fromClass.getName() + "2" + toClass.getName();
     }

src/org/nutz/castor/castor/Number2Boolean.java

@@ -6,7 +6,7 @@ public class Number2Boolean extends Castor<Number, Boolean> {
 
     @Override
     public Boolean cast(Number src, Class<?> toType, String... args) {
-        return src.toString().charAt(0) == '0' ? false : true;
+        return src.intValue() == 0 ? false : true;
     }
 
 }

src/org/nutz/castor/castor/Number2Byte.java

@@ -0,0 +1,12 @@
+package org.nutz.castor.castor;
+
+import org.nutz.castor.Castor;
+
+public class Number2Byte extends Castor<Number, Byte> {
+
+    @Override
+    public Byte cast(Number src, Class<?> toType, String... args) {
+        return src.byteValue();
+    }
+
+}

src/org/nutz/castor/castor/Number2Char.java

@@ -0,0 +1,14 @@
+package org.nutz.castor.castor;
+
+import org.nutz.castor.Castor;
+import org.nutz.castor.FailToCastObjectException;
+
+public class Number2Char extends Castor<Number, Character> {
+
+    @Override
+    public Character cast(Number src, Class<?> toType, String... args)
+            throws FailToCastObjectException {
+        return (char) src.intValue();
+    }
+
+}

src/org/nutz/castor/castor/Number2Double.java

@@ -0,0 +1,12 @@
+package org.nutz.castor.castor;
+
+import org.nutz.castor.Castor;
+
+public class Number2Double extends Castor<Number, Double> {
+
+    @Override
+    public Double cast(Number src, Class<?> toType, String... args) {
+        return src.doubleValue();
+    }
+
+}

src/org/nutz/castor/castor/Number2Float.java

@@ -0,0 +1,12 @@
+package org.nutz.castor.castor;
+
+import org.nutz.castor.Castor;
+
+public class Number2Float extends Castor<Number, Float> {
+
+    @Override
+    public Float cast(Number src, Class<?> toType, String... args) {
+        return src.floatValue();
+    }
+
+}

src/org/nutz/castor/castor/Number2Integer.java

@@ -0,0 +1,12 @@
+package org.nutz.castor.castor;
+
+import org.nutz.castor.Castor;
+
+public class Number2Integer extends Castor<Number, Integer> {
+
+    @Override
+    public Integer cast(Number src, Class<?> toType, String... args) {
+        return src.intValue();
+    }
+
+}

src/org/nutz/castor/castor/Number2Long.java

@@ -0,0 +1,12 @@
+package org.nutz.castor.castor;
+
+import org.nutz.castor.Castor;
+
+public class Number2Long extends Castor<Number, Long> {
+
+    @Override
+    public Long cast(Number src, Class<?> toType, String... args) {
+        return src.longValue();
+    }
+
+}

src/org/nutz/castor/castor/Number2Short.java

@@ -0,0 +1,12 @@
+package org.nutz.castor.castor;
+
+import org.nutz.castor.Castor;
+
+public class Number2Short extends Castor<Number, Short> {
+
+    @Override
+    public Short cast(Number src, Class<?> toType, String... args) {
+        return src.shortValue();
+    }
+
+}

src/org/nutz/castor/castor/String2BigDecimal.java

@@ -2,26 +2,16 @@
 
 import java.math.BigDecimal;
 
-import org.nutz.castor.Castor;
-import org.nutz.castor.FailToCastObjectException;
-import org.nutz.lang.Lang;
-import org.nutz.lang.Strings;
+public class String2BigDecimal extends String2Number<BigDecimal> {
 
-public class String2BigDecimal extends Castor<String, BigDecimal > {
+    @Override
+    protected BigDecimal getPrimitiveDefaultValue() {
+        return new BigDecimal(0);
+    }
 
-    public BigDecimal cast(String src, Class<?> toType, String... args)
-            throws FailToCastObjectException {
-        if (Strings.isBlank(src)) {
-                return null;
-        }
-        try {
-            return new BigDecimal(src);
-        }
-        catch (Exception e) {
-            throw new FailToCastObjectException(String.format(    "Fail to cast '%s' to <%s>",
-                                                                src,
-                                                                toType.getName()), Lang.unwrapThrow(e));
-        }
+    @Override
+    protected BigDecimal valueOf(String str) {
+        return new BigDecimal(str);
     }
 
 }

src/org/nutz/castor/castor/String2Boolean.java

@@ -1,15 +1,14 @@
 package org.nutz.castor.castor;
 
 import org.nutz.castor.Castor;
-import org.nutz.castor.FailToCastObjectException;
 import org.nutz.lang.Lang;
+import org.nutz.lang.Strings;
 
 public class String2Boolean extends Castor<String, Boolean> {
 
     @Override
-    public Boolean cast(String src, Class<?> toType, String... args)
-            throws FailToCastObjectException {
-        if (src.length() == 0)
+    public Boolean cast(String src, Class<?> toType, String... args) {
+        if (Strings.isBlank(src))
             return false;
         return Lang.parseBoolean(src);
     }

src/org/nutz/castor/castor/String2Byte.java

@@ -0,0 +1,15 @@
+package org.nutz.castor.castor;
+
+public class String2Byte extends String2Number<Byte> {
+
+    @Override
+    protected Byte getPrimitiveDefaultValue() {
+        return (byte) 0;
+    }
+
+    @Override
+    protected Byte valueOf(String str) {
+        return Byte.valueOf(str);
+    }
+
+}

src/org/nutz/castor/castor/String2Double.java

@@ -0,0 +1,15 @@
+package org.nutz.castor.castor;
+
+public class String2Double extends String2Number<Double> {
+
+    @Override
+    protected Double getPrimitiveDefaultValue() {
+        return 0.0;
+    }
+
+    @Override
+    protected Double valueOf(String str) {
+        return Double.valueOf(str);
+    }
+
+}

src/org/nutz/castor/castor/String2Float.java

@@ -0,0 +1,15 @@
+package org.nutz.castor.castor;
+
+public class String2Float extends String2Number<Float> {
+
+    @Override
+    protected Float getPrimitiveDefaultValue() {
+        return 0.0f;
+    }
+
+    @Override
+    protected Float valueOf(String str) {
+        return Float.valueOf(str);
+    }
+
+}

src/org/nutz/castor/castor/String2Integer.java

@@ -0,0 +1,15 @@
+package org.nutz.castor.castor;
+
+public class String2Integer extends String2Number<Integer> {
+
+    @Override
+    protected Integer getPrimitiveDefaultValue() {
+        return 0;
+    }
+
+    @Override
+    protected Integer valueOf(String str) {
+        return Integer.valueOf(str);
+    }
+
+}

src/org/nutz/castor/castor/String2Long.java

@@ -0,0 +1,15 @@
+package org.nutz.castor.castor;
+
+public class String2Long extends String2Number<Long> {
+
+    @Override
+    protected Long getPrimitiveDefaultValue() {
+        return 0L;
+    }
+
+    @Override
+    protected Long valueOf(String str) {
+        return Long.valueOf(str);
+    }
+
+}

src/org/nutz/castor/castor/String2Number.java

@@ -3,7 +3,6 @@
 import org.nutz.castor.Castor;
 import org.nutz.castor.FailToCastObjectException;
 import org.nutz.lang.Lang;
-import org.nutz.lang.Mirror;
 import org.nutz.lang.Strings;
 
 /**
@@ -17,28 +16,27 @@
  * 
  * @author zozoh([email protected])
  */
-public class String2Number extends Castor<String, Number> {
+public abstract class String2Number<T> extends Castor<String, T> {
+
+    protected boolean _isNull(String str) {
+        return Strings.isBlank(str) || "null".equalsIgnoreCase(str);
+    }
+
+    protected abstract T getPrimitiveDefaultValue();
+
+    protected abstract T valueOf(String str);
 
     @Override
-    public Number cast(String src, Class<?> toType, String... args) {
-        if (Strings.isBlank(src)) {
-            if (toType.isPrimitive()) {
-                if (toType == float.class || toType == double.class)
-                    return 0.0f;
-                return 0;
-            } else {
-                return null;
-            }
+    public T cast(String src, Class<?> toType, String... args) {
+        if (Strings.isBlank(src) || "null".equalsIgnoreCase(src)) {
+            return toType.isPrimitive() ? getPrimitiveDefaultValue() : null;
         }
         if (!toType.isPrimitive()
             && ("null".equals(src) || "NULL".equals(src) || "Null".equals(src))) {
             return null;
         }
         try {
-            return (Number) Mirror.me(toType)
-                                  .getWrapperClass()
-                                  .getConstructor(String.class)
-                                  .newInstance(src);
+            return valueOf(src);
         }
         catch (Exception e) {
             throw new FailToCastObjectException(String.format("Fail to cast '%s' to <%s>",