JSONField#deserializeFeatures & JSONField#serializeFeatures support config FieldBased

Author: wenshao

core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderBaseModule.java

@@ -1194,13 +1194,14 @@ private void getFieldInfo(FieldInfo fieldInfo, JSONField jsonField) {
                 }
             }
 
+            boolean ignore = !jsonField.deserialize();
             if (!fieldInfo.ignore) {
-                fieldInfo.ignore = !jsonField.deserialize();
+                fieldInfo.ignore = ignore;
             }
 
             for (JSONReader.Feature feature : jsonField.deserializeFeatures()) {
                 fieldInfo.features |= feature.mask;
-                if (fieldInfo.ignore && feature == JSONReader.Feature.FieldBased) {
+                if (fieldInfo.ignore && !ignore && feature == JSONReader.Feature.FieldBased) {
                     fieldInfo.ignore = false;
                 }
             }

core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterBaseModule.java

@@ -1,9 +1,6 @@
 package com.alibaba.fastjson2.writer;
 
-import com.alibaba.fastjson2.JSONFactory;
-import com.alibaba.fastjson2.JSONPObject;
-import com.alibaba.fastjson2.JSONPath;
-import com.alibaba.fastjson2.JSONWriter;
+import com.alibaba.fastjson2.*;
 import com.alibaba.fastjson2.annotation.*;
 import com.alibaba.fastjson2.codec.BeanInfo;
 import com.alibaba.fastjson2.codec.FieldInfo;
@@ -897,8 +894,9 @@ private void loadFieldInfo(FieldInfo fieldInfo, JSONField jsonField) {
                 }
             }
 
+            boolean ignore = !jsonField.serialize();
             if (!fieldInfo.ignore) {
-                fieldInfo.ignore = !jsonField.serialize();
+                fieldInfo.ignore = ignore;
             }
 
             if (jsonField.unwrapped()) {
@@ -907,6 +905,9 @@ private void loadFieldInfo(FieldInfo fieldInfo, JSONField jsonField) {
 
             for (JSONWriter.Feature feature : jsonField.serializeFeatures()) {
                 fieldInfo.features |= feature.mask;
+                if (fieldInfo.ignore && !ignore && feature == JSONWriter.Feature.FieldBased) {
+                    fieldInfo.ignore = false;
+                }
             }
 
             int ordinal = jsonField.ordinal();

core/src/test/java/com/alibaba/fastjson2/issues_2300/Issue2350.java

@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONReader;
+import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.annotation.JSONField;
 import org.junit.jupiter.api.Test;
 
@@ -15,19 +16,19 @@ public void test() {
                 "\t\"testField\": \"My Test\",\n" +
                 "\t\"testField2\": \"My Test2\"\n" +
                 "}";
-        TestClass testClass = JSON.parseObject(json, TestClass.class);
-        assertEquals("My Test", testClass.getTestField());
-        assertNull(testClass.getTestField2());
+        Bean bean = JSON.parseObject(json, Bean.class);
+        assertEquals("My Test", bean.testField);
+        assertNull(bean.getTestField2());
+
+        String str = JSON.toJSONString(bean);
+        System.out.println(str);
     }
 
-    public static class TestClass {
-        @JSONField(deserializeFeatures = JSONReader.Feature.FieldBased)
+    public static class Bean {
+        @JSONField(deserializeFeatures = JSONReader.Feature.FieldBased, serializeFeatures = JSONWriter.Feature.FieldBased)
         private String testField;
         private String testField2;
 
-        public String getTestField() {
-            return testField;
-        }
         public String getTestField2() {
             return testField2;
         }