bug fixed for final field. fixed issue #698

alibaba · Jun 27, 2016 · 0a9eff8 · 0a9eff8
1 parent 31a396f
commit 0a9eff8
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 3 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/parser/JavaBeanInfo.java b/src/main/java/com/alibaba/fastjson/parser/JavaBeanInfo.java
@@ -478,22 +478,40 @@ public static JavaBeanInfo build(Class<?> clazz, //
         {
             classfields = new ArrayList<Field>(declaredFields.length);
             for (Field f : declaredFields) {
-                if ((f.getModifiers() & Modifier.STATIC) != 0) {
+                int modifiers = f.getModifiers();
+                if ((modifiers & Modifier.STATIC) != 0) {
                     continue;
                 }
 
+                if((modifiers & Modifier.FINAL) != 0) {
+                    Class<?> fieldType = f.getType();
+                    boolean supportReadOnly = Map.class.isAssignableFrom(fieldType) || Collection.class.isAssignableFrom(fieldType);
+                    if (!supportReadOnly) {
+                        continue;
+                    }
+                }
+
                 if ((f.getModifiers() & Modifier.PUBLIC) != 0) {
                     classfields.add(f);
                 }
             }
 
             for (Class<?> c = clazz.getSuperclass(); c != null && c != Object.class; c = c.getSuperclass()) {
                 for (Field f : c.getDeclaredFields()) {
-                    if ((f.getModifiers() & Modifier.STATIC) != 0) {
+                    int modifiers = f.getModifiers();
+                    if ((modifiers & Modifier.STATIC) != 0) {
                         continue;
                     }
 
-                    if ((f.getModifiers() & Modifier.PUBLIC) != 0) {
+                    if((modifiers & Modifier.FINAL) != 0) {
+                        Class<?> fieldType = f.getType();
+                        boolean supportReadOnly = Map.class.isAssignableFrom(fieldType) || Collection.class.isAssignableFrom(fieldType);
+                        if (!supportReadOnly) {
+                            continue;
+                        }
+                    }
+
+                    if ((modifiers & Modifier.PUBLIC) != 0) {
                         classfields.add(f);
                     }
                 }

diff --git a/src/test/java/com/alibaba/json/bvt/FinalTest.java b/src/test/java/com/alibaba/json/bvt/FinalTest.java
@@ -0,0 +1,23 @@
+package com.alibaba.json.bvt;
+
+import org.junit.Assert;
+
+import com.alibaba.fastjson.JSON;
+
+import junit.framework.TestCase;
+
+public class FinalTest extends TestCase {
+    public void test_final() throws Exception {
+        VO vo = new VO();
+        String text = JSON.toJSONString(vo);
+        Assert.assertEquals("{\"value\":1001}", text);
+        JSON.parseObject(text, VO.class);
+        JSON.parseObject("{\"id\":1001,\"value\":1001}", VO.class);
+    }
+
+
+    public static class VO {
+        public final static int id = 1001;
+        public final int value = 1001;
+    }
+}