Fix issue1866. (#1880)

* Fix issue1866. * fix code. * format code.
alibaba · Sep 26, 2023 · a6a7d82 · a6a7d82
1 parent 88675ad
commit a6a7d82
Show file tree

Hide file tree

Showing 2 changed files with 114 additions and 10 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreatorASM.java b/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreatorASM.java
@@ -2257,19 +2257,34 @@ private void gwInt32(
 
         mw.visitJumpInsn(Opcodes.IFNONNULL, notNull_);
 
-        mwc.genIsEnabled(
-                WriteNulls.mask | NullAsDefaultValue.mask | WriteNullNumberAsZero.mask,
-                writeNullValue_,
-                endIfNull_
-        );
+        if ((fieldWriter.features & (WriteNulls.mask | NullAsDefaultValue.mask | WriteNullNumberAsZero.mask)) == 0) {
+            mwc.genIsEnabled(
+                    WriteNulls.mask | NullAsDefaultValue.mask | WriteNullNumberAsZero.mask,
+                    writeNullValue_,
+                    endIfNull_
+            );
 
-        mw.visitLabel(writeNullValue_);
+            mw.visitLabel(writeNullValue_);
 
-        gwFieldName(mwc, fieldWriter, i);
+            gwFieldName(mwc, fieldWriter, i);
 
-        // TODO : if ((features & (JSONWriter.Feature.WriteNulls.mask | JSONWriter.Feature.NullAsEmpty.mask)) == 0) {
-        mw.visitVarInsn(Opcodes.ALOAD, JSON_WRITER);
-        mw.visitMethodInsn(Opcodes.INVOKEVIRTUAL, TYPE_JSON_WRITER, "writeNumberNull", "()V", false);
+            mw.visitVarInsn(Opcodes.ALOAD, JSON_WRITER);
+            mw.visitMethodInsn(Opcodes.INVOKEVIRTUAL, TYPE_JSON_WRITER, "writeNumberNull", "()V", false);
+        } else {
+            long features = fieldWriter.features;
+            if ((features & (WriteNullNumberAsZero.mask | NullAsDefaultValue.mask)) != 0) {
+                gwFieldName(mwc, fieldWriter, i);
+
+                mw.visitVarInsn(Opcodes.ALOAD, JSON_WRITER);
+                mw.visitLdcInsn(0);
+                mw.visitMethodInsn(Opcodes.INVOKEVIRTUAL, TYPE_JSON_WRITER, "writeInt32", "(I)V", false);
+            } else {  // (features & WriteNulls.mask) != 0
+                gwFieldName(mwc, fieldWriter, i);
+
+                mw.visitVarInsn(Opcodes.ALOAD, JSON_WRITER);
+                mw.visitMethodInsn(Opcodes.INVOKEVIRTUAL, TYPE_JSON_WRITER, "writeNull", "()V", false);
+            }
+        }
 
         mw.visitJumpInsn(Opcodes.GOTO, endIfNull_);
 

diff --git a/core/src/test/java/com/alibaba/fastjson2/issues_1800/Issue1866.java b/core/src/test/java/com/alibaba/fastjson2/issues_1800/Issue1866.java
@@ -0,0 +1,89 @@
+package com.alibaba.fastjson2.issues_1800;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONWriter;
+import com.alibaba.fastjson2.annotation.JSONField;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class Issue1866 {
+    @Test
+    public void test() {
+        User hello = new User();
+        hello.setAge1(null);  // WriteNullNumberAsZero, 期望为0
+        hello.setAge2(null);  // WriteNulls, 期望为null
+        hello.setAge3(null);  // NullAsDefaultValue, 期望为0
+        hello.setAge4(null);  // 期望不被序列化
+        // age5, age6不为null应不受影响
+        hello.setAge5(10);
+        hello.setAge6(10);
+        System.out.println(JSON.toJSONString(hello));
+        assertEquals("{\"age1\":0,\"age2\":null,\"age3\":0,\"age5\":10,\"age6\":10}", JSON.toJSONString(hello));
+    }
+
+    public static class User {
+        @JSONField(serializeFeatures = JSONWriter.Feature.WriteNullNumberAsZero)
+        private Integer age1;
+
+        @JSONField(serializeFeatures = JSONWriter.Feature.WriteNulls)
+        private Integer age2;
+
+        @JSONField(serializeFeatures = JSONWriter.Feature.NullAsDefaultValue)
+        private Integer age3;
+
+        private Integer age4;
+
+        private Integer age5;
+
+        private Integer age6;
+
+        public Integer getAge1() {
+            return age1;
+        }
+
+        public void setAge1(Integer age1) {
+            this.age1 = age1;
+        }
+
+        public Integer getAge2() {
+            return age2;
+        }
+
+        public void setAge2(Integer age2) {
+            this.age2 = age2;
+        }
+
+        public Integer getAge3() {
+            return age3;
+        }
+
+        public void setAge3(Integer age3) {
+            this.age3 = age3;
+        }
+
+        public Integer getAge4() {
+            return age4;
+        }
+
+        public void setAge4(Integer age4) {
+            this.age4 = age4;
+        }
+
+        public Integer getAge5() {
+            return age5;
+        }
+
+        public void setAge5(Integer age5) {
+            this.age5 = age5;
+        }
+
+        public Integer getAge6() {
+            return age6;
+        }
+
+        public void setAge6(Integer age6) {
+            this.age6 = age6;
+        }
+    }
+}