1.2.25.internal.v6

wenshao · wenshao · commit d7078548dc34 · 2017-01-29T19:27:35.000+08:00
diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java
@@ -731,7 +731,7 @@ public static final int writeJSONString(OutputStream os, //
                                             int defaultFeatures, //
                                             SerializerFeature... features) throws IOException {
        return writeJSONString(os,  //
-                              IOUtils.UTF8, // 
+                              IOUtils.UTF8, //
                               object, //
                               SerializeConfig.globalInstance, //
                               null, //
diff --git a/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java b/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java
@@ -319,7 +319,7 @@ public final Object parseObject(final Map object, Object fieldName) {
 
                 if (key == JSON.DEFAULT_TYPE_KEY && !lexer.isEnabled(Feature.DisableSpecialKeyDetect)) {
                     String typeName = lexer.scanSymbol(symbolTable, '"');
-                    Class<?> clazz = config.checkAutoType(typeName);
+                    Class<?> clazz = config.checkAutoType(typeName, null);
 
                     if (clazz == null) {
                         object.put(JSON.DEFAULT_TYPE_KEY, typeName);
diff --git a/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java b/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/AbstractDateDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/AbstractDateDeserializer.java
@@ -92,7 +92,7 @@ public <T> T deserialze(DefaultJSONParser parser, Type clazz, Object fieldName,
                     parser.accept(JSONToken.COLON);
                     
                     String typeName = lexer.stringVal();
-                    Class<?> type = TypeUtils.loadClass(typeName, parser.getConfig().getDefaultClassLoader());
+                    Class<?> type = parser.getConfig().checkAutoType(typeName, null);
                     if (type != null) {
                         clazz = type;
                     }
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/JavaBeanDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/JavaBeanDeserializer.java
@@ -548,15 +548,9 @@ protected <T> T deserialze(DefaultJSONParser parser, //
                             ObjectDeserializer deserizer = getSeeAlso(config, this.beanInfo, typeName);
                             Class<?> userType = null;
                             if (deserizer == null) {
-                                userType = TypeUtils.loadClass(typeName, config.getDefaultClassLoader());
-                                
                                 Class<?> expectClass = TypeUtils.getClass(type);
-                                if (expectClass == null || 
-                                    (userType != null && expectClass.isAssignableFrom(userType))) {
-                                    deserizer = parser.getConfig().getDeserializer(userType);                                        
-                                } else {
-                                    throw new JSONException("type not match");
-                                }
+                                userType = config.checkAutoType(typeName, expectClass);
+                                deserizer = parser.getConfig().getDeserializer(userType);
                             }
                             
                             return (T) deserizer.deserialze(parser, userType, fieldName);
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/MapDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/MapDeserializer.java
@@ -127,7 +127,7 @@ public static Map parseMap(DefaultJSONParser parser, Map<String, Object> map, Ty
                     String typeName = lexer.scanSymbol(parser.getSymbolTable(), '"');
                     final ParserConfig config = parser.getConfig();
 
-                    Class<?> clazz = config.checkAutoType(typeName);
+                    Class<?> clazz = config.checkAutoType(typeName, null);
 
                     if (Map.class.isAssignableFrom(clazz) ) {
                         lexer.nextToken(JSONToken.COMMA);
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/ThrowableDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/ThrowableDeserializer.java
@@ -72,7 +72,7 @@ public <T> T deserialze(DefaultJSONParser parser, Type type, Object fieldName) {
             if (JSON.DEFAULT_TYPE_KEY.equals(key)) {
                 if (lexer.token() == JSONToken.LITERAL_STRING) {
                     String exClassName = lexer.stringVal();
-                    exClass = TypeUtils.loadClass(exClassName, parser.getConfig().getDefaultClassLoader());
+                    exClass = parser.getConfig().checkAutoType(exClassName, Throwable.class);
                 } else {
                     throw new JSONException("syntax error");
                 }
@@ -105,6 +105,10 @@ public <T> T deserialze(DefaultJSONParser parser, Type type, Object fieldName) {
         if (exClass == null) {
             ex = new Exception(message, cause);
         } else {
+            if (!Throwable.class.isAssignableFrom(exClass)) {
+                throw new JSONException("type not match, not Throwable. " + exClass.getName());
+            }
+
             try {
                 ex = createException(message, cause, exClass);
                 if (ex == null) {
diff --git a/src/main/java/com/alibaba/fastjson/serializer/SerializeWriter.java b/src/main/java/com/alibaba/fastjson/serializer/SerializeWriter.java
@@ -32,6 +32,7 @@
  * @author wenshao[szujobs@hotmail.com]
  */
 public final class SerializeWriter extends Writer {
+    private final static Charset   UTF8                            = Charset.forName("UTF-8");
 
     private final static ThreadLocal<char[]>         bufLocal      = new ThreadLocal<char[]>();
     private final static ThreadLocal<byte[]>         bytesBufLocal = new ThreadLocal<byte[]>();
@@ -322,7 +323,7 @@ public int writeToEx(OutputStream out, Charset charset) throws IOException {
             throw new UnsupportedOperationException("writer not null");
         }
         
-        if (charset == IOUtils.UTF8) {
+        if (charset == UTF8) {
             return encodeToUTF8(out);
         } else {
             byte[] bytes = new String(buf, 0, count).getBytes(charset);
@@ -362,7 +363,7 @@ public char[] toCharArrayForSpringWebSocket() {
 
     public byte[] toBytes(String charsetName) {
         return toBytes(charsetName == null || "UTF-8".equals(charsetName) //
-            ? IOUtils.UTF8 //
+            ? UTF8 //
             : Charset.forName(charsetName));
     }
 
@@ -371,7 +372,7 @@ public byte[] toBytes(Charset charset) {
             throw new UnsupportedOperationException("writer not null");
         }
         
-        if (charset == IOUtils.UTF8) {
+        if (charset == UTF8) {
             return encodeToUTF8Bytes();
         } else {
             return new String(buf, 0, count).getBytes(charset);
diff --git a/src/main/java/com/alibaba/fastjson/support/config/FastJsonConfig.java b/src/main/java/com/alibaba/fastjson/support/config/FastJsonConfig.java
@@ -71,7 +71,7 @@ public class FastJsonConfig {
      */
     public FastJsonConfig() {
 
-        this.charset = IOUtils.UTF8;
+        this.charset = Charset.forName("UTF-8");
 
         this.serializeConfig = SerializeConfig.getGlobalInstance();
         this.parserConfig = new ParserConfig();
diff --git a/src/main/java/com/alibaba/fastjson/support/jaxrs/FastJsonProvider.java b/src/main/java/com/alibaba/fastjson/support/jaxrs/FastJsonProvider.java
@@ -39,9 +39,8 @@
 @Produces({MediaType.WILDCARD})
 public class FastJsonProvider //
         implements MessageBodyReader<Object>, MessageBodyWriter<Object> {
-
     @Deprecated
-    protected Charset charset = IOUtils.UTF8;
+    protected Charset charset = Charset.forName("UTF-8");
 
     @Deprecated
     protected SerializerFeature[] features = new SerializerFeature[0];
diff --git a/src/main/java/com/alibaba/fastjson/support/spring/FastJsonHttpMessageConverter.java b/src/main/java/com/alibaba/fastjson/support/spring/FastJsonHttpMessageConverter.java
@@ -35,9 +35,7 @@
 public class FastJsonHttpMessageConverter //
         extends AbstractHttpMessageConverter<Object> //
         implements GenericHttpMessageConverter<Object> {
-
-    @Deprecated
-    protected Charset charset = IOUtils.UTF8;
+    private Charset             charset    = Charset.forName("UTF-8");
 
     @Deprecated
     protected SerializerFeature[] features = new SerializerFeature[0];
diff --git a/src/main/java/com/alibaba/fastjson/support/spring/FastJsonJsonView.java b/src/main/java/com/alibaba/fastjson/support/spring/FastJsonJsonView.java
@@ -35,7 +35,7 @@ public class FastJsonJsonView extends AbstractView {
     public static final String DEFAULT_CONTENT_TYPE = "application/json;charset=UTF-8";
 
     @Deprecated
-    protected Charset charset = IOUtils.UTF8;
+    protected Charset charset = Charset.forName("UTF-8");
 
     @Deprecated
     protected SerializerFeature[] features = new SerializerFeature[0];
diff --git a/src/main/java/com/alibaba/fastjson/support/spring/FastJsonpHttpMessageConverter4.java b/src/main/java/com/alibaba/fastjson/support/spring/FastJsonpHttpMessageConverter4.java
@@ -5,6 +5,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Type;
+import java.nio.charset.Charset;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
diff --git a/src/main/java/com/alibaba/fastjson/util/TypeUtils.java b/src/main/java/com/alibaba/fastjson/util/TypeUtils.java
@@ -883,7 +883,11 @@ public static <T> T castToJavaBean(Map<String, Object> map, Class<T> clazz, Pars
                 if (iClassObject instanceof String) {
                     String className = (String) iClassObject;
 
-                    Class<?> loadClazz = (Class<T>) loadClass(className);
+                    Class<?> loadClazz;
+                    if (config == null) {
+                        config = ParserConfig.global;
+                    }
+                    loadClazz = config.checkAutoType(className, null);
 
                     if (loadClazz == null) {
                         throw new ClassNotFoundException(className + " not found");
@@ -1019,6 +1023,7 @@ private static void addBaseClassMappings() {
                 java.sql.Time.class,
                 java.sql.Date.class,
                 java.sql.Timestamp.class,
+                java.text.SimpleDateFormat.class,
                 loadClass("java.awt.Rectangle"),
                 loadClass("java.awt.Point"),
                 loadClass("java.awt.Font"),
@@ -1100,7 +1105,7 @@ public static Class<?> loadClass(String className, ClassLoader classLoader) {
         try {
             ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 
-            if (contextClassLoader != null) {
+            if (contextClassLoader != null && contextClassLoader != classLoader) {
                 clazz = contextClassLoader.loadClass(className);
                 mappings.put(className, clazz);
 
diff --git a/src/test/java/com/alibaba/fastjson/deserializer/issues569/parser/ParserConfigBug569.java b/src/test/java/com/alibaba/fastjson/deserializer/issues569/parser/ParserConfigBug569.java
@@ -52,7 +52,7 @@ public FieldDeserializer createFieldDeserializer(ParserConfig mapping, //
     }
 
     public ObjectDeserializer getDeserializer(Class<?> clazz, Type type) {
-        com.alibaba.fastjson.util.IdentityHashMap<Type, ObjectDeserializer> derializers = super.getDerializers();
+        com.alibaba.fastjson.util.IdentityHashMap<Type, ObjectDeserializer> derializers = super.getDeserializers();
         ObjectDeserializer derializer = derializers.get(type);
         if (derializer != null) {
             return derializer;
diff --git a/src/test/java/com/alibaba/json/bvt/JSONObjectTest_get_2.java b/src/test/java/com/alibaba/json/bvt/JSONObjectTest_get_2.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.alibaba.fastjson.parser.ParserConfig;
 import org.junit.Assert;
 
 import com.alibaba.fastjson.JSON;
@@ -12,6 +13,9 @@
 import junit.framework.TestCase;
 
 public class JSONObjectTest_get_2 extends TestCase {
+    protected void setUp() throws Exception {
+        ParserConfig.global.addAccept("com.alibaba.json.bvt.JSONObjectTest_get_2.");
+    }
 
     public void test_get() throws Exception {
         JSONObject obj = JSON.parseObject("{\"value\":{}}");
diff --git a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest_castToJavaBean.java b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest_castToJavaBean.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
 
+import com.alibaba.fastjson.parser.ParserConfig;
 import org.junit.Assert;
 
 import com.alibaba.fastjson.JSON;
@@ -19,6 +20,9 @@
 import junit.framework.TestCase;
 
 public class TypeUtilsTest_castToJavaBean extends TestCase {
+    protected void setUp() throws Exception {
+        ParserConfig.global.addAccept("com.alibaba.json.bvt.parser.TypeUtilsTest_castToJavaBean.");
+    }
 
     public void test_castToJavaBean_StackTraceElement() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest12.java b/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest12.java
@@ -0,0 +1,30 @@
+package com.alibaba.json.bvt.parser.deser.deny;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
+import junit.framework.TestCase;
+
+/**
+ * Created by wenshao on 29/01/2017.
+ */
+public class DenyTest12 extends TestCase {
+    public void test_deny() throws Exception {
+        String text = "{\"value\":{\"@type\":\"java.lang.Thread\"}}";
+
+        Exception error = null;
+        try {
+            JSON.parseObject(text, Model.class);
+        } catch (JSONException ex) {
+            error = ex;
+        }
+        assertNotNull(error);
+    }
+
+    public static class Model {
+        public Value value;
+    }
+
+    public static class Value {
+
+    }
+}
diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest13.java b/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest13.java
@@ -0,0 +1,25 @@
+package com.alibaba.json.bvt.parser.deser.deny;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
+import junit.framework.TestCase;
+
+/**
+ * Created by wenshao on 29/01/2017.
+ */
+public class DenyTest13 extends TestCase {
+    public void test_deny() throws Exception {
+        String text = "{\"value\":{\"@type\":\"java.lang.Thread\"}}";
+        Exception error = null;
+        try {
+            JSON.parseObject(text, Model.class);
+        } catch (JSONException ex) {
+            error = ex;
+        }
+        assertNotNull(error);
+    }
+
+    public static class Model {
+        public Object value;
+    }
+}
diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest14.java b/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest14.java
@@ -0,0 +1,24 @@
+package com.alibaba.json.bvt.parser.deser.deny;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
+import junit.framework.TestCase;
+
+/**
+ * Created by wenshao on 29/01/2017.
+ */
+public class DenyTest14 extends TestCase {
+    public void test_deny() throws Exception {
+        String text = "{\"value\":{\"@type\":\"com.alibaba.json.bvt.parser.deser.deny.DenyTest14$MyException\"}}";
+        Model model = JSON.parseObject(text, Model.class);
+        assertTrue(model.value instanceof MyException);
+    }
+
+    public static class Model {
+        public Throwable value;
+    }
+
+    public static class MyException extends Exception {
+
+    }
+}
diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest15.java b/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest15.java
@@ -0,0 +1,24 @@
+package com.alibaba.json.bvt.parser.deser.deny;
+
+import com.alibaba.fastjson.JSON;
+import junit.framework.TestCase;
+
+/**
+ * Created by wenshao on 29/01/2017.
+ */
+public class DenyTest15 extends TestCase {
+    public void test_deny() throws Exception {
+        String text = "{\"value\":{\"@type\":\"com.mchange.v2.c3p0.impl.PoolBackedDataSourceBase\"}}";
+        Exception error = null;
+        try {
+            Model model = JSON.parseObject(text, Model.class);
+        } catch (Exception ex) {
+            error = ex;
+        }
+        assertNotNull(error);
+    }
+
+    public static class Model {
+        public Throwable value;
+    }
+}
diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest5.java b/src/test/java/com/alibaba/json/bvt/parser/deser/deny/DenyTest5.java
@@ -2,23 +2,25 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.parser.ParserConfig;
 import junit.framework.TestCase;
 
 public class DenyTest5 extends TestCase {
 
     public void test_c3p0() throws Exception {
+        ParserConfig config = new ParserConfig();
+        config.setAutoTypeSupport(true);
+
+        Object obj = null;
         Exception error = null;
         try {
-            Object obj = JSON.parseObject("{\"@type\":\"com.mchange.v2.c3p0.impl.PoolBackedDataSourceBase\"}", Object.class);
+            obj = JSON.parseObject("{\"@type\":\"com.mchange.v2.c3p0.impl.PoolBackedDataSourceBase\"}", Object.class, config);
             System.out.println(obj.getClass());
         } catch (JSONException ex) {
             error = ex;
         }
         assertNotNull(error);
     }
-    
-    public static class MyClassLoader extends ClassLoader {
 
-    }
 
 }
diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ParserConfigTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ParserConfigTest.java
@@ -11,7 +11,7 @@ public class ParserConfigTest extends TestCase {
 
     public void test_0() throws Exception {
         ParserConfig config = new ParserConfig();
-        config.getDerializers();
+        config.getDeserializers();
     }
     
     
diff --git a/src/test/java/com/alibaba/json/test/deny/NotExistsTest.java b/src/test/java/com/alibaba/json/test/deny/NotExistsTest.java

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public <T> T deserialze(DefaultJSONParser parser, Type clazz, Object fieldName,`
`92`	`92`	`parser.accept(JSONToken.COLON);`
`93`	`93`
`94`	`94`	`String typeName = lexer.stringVal();`
`95`		`- Class<?> type = TypeUtils.loadClass(typeName, parser.getConfig().getDefaultClassLoader());`
	`95`	`+ Class<?> type = parser.getConfig().checkAutoType(typeName, null);`
`96`	`96`	`if (type != null) {`
`97`	`97`	`clazz = type;`
`98`	`98`	`}`