Merge pull request alibaba#18 from alibaba/master

merge

README.md

@@ -37,7 +37,7 @@ http://repo1.maven.org/maven2/com/alibaba/fastjson/
 <dependency>
  <groupId>com.alibaba</groupId>
  <artifactId>fastjson</artifactId>
- <version>1.2.12</version>
+ <version>1.2.14</version>
 </dependency>
 ```
 

pom.xml

@@ -12,7 +12,7 @@
 
  <groupId>com.alibaba</groupId>
  <artifactId>fastjson</artifactId>
- <version>1.2.14-SNAPSHOT</version>
+ <version>1.2.15-SNAPSHOT</version>
 
  <packaging>jar</packaging>
  <name>fastjson</name>

src/main/java/com/alibaba/fastjson/JSON.java

@@ -112,6 +112,18 @@ public abstract class JSON implements JSONStreamAware, JSONAware {
  DEFAULT_GENERATE_FEATURE = features;
  }
 
+ /**
+ * config default type key
+ * @since 1.2.14
+ */
+ public static void setDefaultTypeKey(String typeKey) {
+ DEFAULT_TYPE_KEY = typeKey;
+ ParserConfig.global.symbolTable.addSymbol(typeKey, 
+ 0, 
+ typeKey.length(), 
+ typeKey.hashCode());
+ }
+
  public static Object parse(String text) {
  return parse(text, DEFAULT_PARSER_FEATURE);
  }
@@ -912,7 +924,7 @@ public <T> T toJavaObject(Class<T> clazz) {
  return TypeUtils.cast(this, clazz, ParserConfig.getGlobalInstance());
  }
 
- public final static String VERSION = "1.2.14";
+ public final static String VERSION = "1.2.15";
 
  private final static ThreadLocal<byte[]> bytesLocal = new ThreadLocal<byte[]>();
  private static byte[] allocateBytes(int length) {

src/main/java/com/alibaba/fastjson/JSONArray.java

@@ -45,9 +45,9 @@
 /**
  * @author wenshao[szujobs@hotmail.com]
  */
-@SuppressWarnings("serial")
 public class JSONArray extends JSON implements List<Object>, Cloneable, RandomAccess, Serializable {
 
+ private static final long serialVersionUID = 1L;
  private final List<Object> list;
  protected transient Object relatedArray;
  protected transient Type componentType;

src/main/java/com/alibaba/fastjson/JSONObject.java

@@ -48,9 +48,9 @@
 /**
  * @author wenshao[szujobs@hotmail.com]
  */
-@SuppressWarnings("serial")
 public class JSONObject extends JSON implements Map<String, Object>, Cloneable, Serializable, InvocationHandler {
 
+ private static final long serialVersionUID = 1L;
  private static final int DEFAULT_INITIAL_CAPACITY = 16;
 
  private final Map<String, Object> map;