fastjsont-1.1.34.android

Author: wenshao

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.alibaba</groupId>
 	<artifactId>fastjson</artifactId>
-	<version>1.1.33.android</version>
+	<version>1.1.34.android</version>
 
 	<packaging>jar</packaging>
 	<name>fastjson</name>

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

@@ -659,5 +659,5 @@ public static final <T> T toJavaObject(JSON json, Class<T> clazz) {
         return TypeUtils.cast(json, clazz, ParserConfig.getGlobalInstance());
     }
 
-    public final static String VERSION = "1.1.33-android";
+    public final static String VERSION = "1.1.34-android";
 }

src/main/java/com/alibaba/fastjson/util/DeserializeBeanInfo.java

@@ -196,11 +196,7 @@ public static DeserializeBeanInfo computeSetters(Class<?> clazz, Type type) {
 
             String propertyName;
             if (Character.isUpperCase(c3)) {
-                if (methodName.length() > 4 && Character.isUpperCase(methodName.charAt(4))) {
-                    propertyName = methodName.substring(3);
-                } else {
-                    propertyName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
-                }
+                propertyName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
             } else if (c3 == '_') {
                 propertyName = methodName.substring(4);
             } else if (c3 == 'f') {

src/main/java/com/alibaba/fastjson/util/TypeUtils.java

@@ -946,11 +946,7 @@ public static List<FieldInfo> computeGetters(Class<?> clazz, Map<String, String>
 
                 String propertyName;
                 if (Character.isUpperCase(c3)) {
-                    if (methodName.length() > 4 && Character.isUpperCase(methodName.charAt(4))) {
-                        propertyName = methodName.substring(3);
-                    } else {
-                        propertyName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
-                    }
+                    propertyName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
                 } else if (c3 == '_') {
                     propertyName = methodName.substring(4);
                 } else if (c3 == 'f') {

src/test/java/com/alibaba/json/bvt/JSONFeidDemo2.java

@@ -23,7 +23,7 @@ public void test_0() throws Exception {
 		System.out.println(text);
 
 		assertEquals(
-				"{\"IM_PREQ_NO\":\"111111\",\"TB_PR_INFO\":[{\"PREQ_NO\":\"t1\"},{\"PREQ_NO\":\"t2\"}]}",
+				"{\"iM_PREQ_NO\":\"111111\",\"tB_PR_INFO\":[{\"PREQ_NO\":\"t1\"},{\"PREQ_NO\":\"t2\"}]}",
 				text);
 
 	}

src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest5.java

@@ -14,7 +14,7 @@ public void test_jsonField() throws Exception {
         vo.setID(123);
 
         String text = JSON.toJSONString(vo);
-        Assert.assertEquals("{\"ID\":123}", text);
+        Assert.assertEquals("{\"iD\":123}", text);
 
         Assert.assertEquals(123, JSON.parseObject(text, VO.class).getID());
     }