bug fixed for issue 555

alibaba · May 21, 2016 · 3339419 · 3339419
1 parent 6af506c
commit 3339419
Show file tree

Hide file tree

Showing 4 changed files with 136 additions and 1 deletion.
diff --git a/src/main/java/com/alibaba/fastjson/util/JavaBeanInfo.java b/src/main/java/com/alibaba/fastjson/util/JavaBeanInfo.java
@@ -403,6 +403,10 @@ public static JavaBeanInfo build(Class<?> clazz, Type type) {
                 fieldAnnotation = field.getAnnotation(JSONField.class);
 
                 if (fieldAnnotation != null) {
+                    if (!fieldAnnotation.deserialize()) {
+                        continue;
+                    }
+
                     ordinal = fieldAnnotation.ordinal();
                     serialzeFeatures = SerializerFeature.of(fieldAnnotation.serialzeFeatures());
                     parserFeatures = Feature.of(fieldAnnotation.parseFeatures());
@@ -444,6 +448,10 @@ public static JavaBeanInfo build(Class<?> clazz, Type type) {
             JSONField fieldAnnotation = field.getAnnotation(JSONField.class);
 
             if (fieldAnnotation != null) {
+                if (!fieldAnnotation.deserialize()) {
+                    continue;
+                }
+
                 ordinal = fieldAnnotation.ordinal();
                 serialzeFeatures = SerializerFeature.of(fieldAnnotation.serialzeFeatures());
                 parserFeatures = Feature.of(fieldAnnotation.parseFeatures());
@@ -480,12 +488,16 @@ public static JavaBeanInfo build(Class<?> clazz, Type type) {
                     String propertyName;
 
                     JSONField annotation = method.getAnnotation(JSONField.class);
+                    if (annotation != null && annotation.deserialize()) {
+                        continue;
+                    }
+
                     if (annotation != null && annotation.name().length() > 0) {
                         propertyName = annotation.name();
                     } else {
                         propertyName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
                     }
-
+                    
                     FieldInfo fieldInfo = getField(fieldList, propertyName);
                     if (fieldInfo != null) {
                         continue;

diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_555.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_555.java
@@ -0,0 +1,34 @@
+package com.alibaba.json.bvt.bug;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import junit.framework.TestCase;
+
+public class Bug_for_issue_555 extends TestCase {
+
+    public void test_for_issue() throws Exception {
+        JSON.parseObject("{\"list\":[{\"spec\":{}}]}", A.class);
+    }
+
+    public static class A {
+
+        public List<B> list;
+    }
+
+    public static class B {
+
+        @JSONField(serialize = true, deserialize = false)
+        public Spec spec;
+    }
+
+    public static class Spec {
+        private int id;
+
+        public Spec(int id) {
+            this.id = id;
+        }
+    }
+}
diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_555_setter.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_555_setter.java
@@ -0,0 +1,44 @@
+package com.alibaba.json.bvt.bug;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import junit.framework.TestCase;
+
+public class Bug_for_issue_555_setter extends TestCase {
+
+    public void test_for_issue() throws Exception {
+        JSON.parseObject("{\"list\":[{\"spec\":{}}]}", A.class);
+    }
+
+    public static class A {
+
+        public List<B> list;
+    }
+
+    public static class B {
+
+        @JSONField(serialize = true, deserialize = false)
+        private Spec spec;
+
+        public Spec getSpec() {
+            return spec;
+        }
+
+        public void setSpec(Spec spec) {
+            this.spec = spec;
+        }
+
+    }
+
+    public static class Spec {
+
+        private int id;
+
+        public Spec(int id){
+            this.id = id;
+        }
+    }
+}
diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_555_setter2.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_555_setter2.java
@@ -0,0 +1,45 @@
+package com.alibaba.json.bvt.bug;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import junit.framework.TestCase;
+
+public class Bug_for_issue_555_setter2 extends TestCase {
+
+    public void test_for_issue() throws Exception {
+        JSON.parseObject("{\"list\":[{\"spec\":{}}]}", A.class);
+    }
+
+    public static class A {
+
+        public List<B> list;
+    }
+
+    public static class B {
+
+        private Spec spec;
+
+        @JSONField(serialize = true, deserialize = false)
+        public Spec getSpec() {
+            return spec;
+        }
+
+        @JSONField(serialize = true, deserialize = false)
+        public void setSpec(Spec spec) {
+            this.spec = spec;
+        }
+
+    }
+
+    public static class Spec {
+
+        private int id;
+
+        public Spec(int id){
+            this.id = id;
+        }
+    }
+}