bug fix for android support

HuJiShuang · Nov 12, 2022 · 3ab32e7 · 3ab32e7
1 parent 662a04b
commit 3ab32e7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterObject.java b/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterObject.java
@@ -170,6 +170,10 @@ public boolean write(JSONWriter jsonWriter, T object) {
                     jsonWriter.writeArrayNull();
                 } else if (number) {
                     jsonWriter.writeNumberNull();
+                } else if (fieldClass == Appendable.class
+                        || fieldClass == StringBuffer.class
+                        || fieldClass == StringBuilder.class) {
+                    jsonWriter.writeStringNull();
                 } else {
                     jsonWriter.writeNull();
                 }

diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java b/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java
@@ -725,8 +725,27 @@ public <T> FieldWriter<T> createFieldWriter(
             return new FieldWriterStringField(fieldName, ordinal, features, format, label, field);
         }
 
-        if (fieldClass.isEnum() && BeanUtils.getEnumValueField(fieldClass, provider) == null) {
-            return new FIeldWriterEnumField(fieldName, ordinal, features, format, label, fieldClass, field);
+        if (fieldClass.isEnum()) {
+            BeanInfo beanInfo = new BeanInfo();
+            for (ObjectWriterModule module : provider.modules) {
+                ObjectWriterAnnotationProcessor annotationProcessor = module.getAnnotationProcessor();
+                if (annotationProcessor != null) {
+                    annotationProcessor.getBeanInfo(beanInfo, fieldClass);
+                }
+            }
+
+            boolean writeEnumAsJavaBean = beanInfo.writeEnumAsJavaBean;
+            if (!writeEnumAsJavaBean) {
+                ObjectWriter objectWriter = provider.cache.get(fieldClass);
+                if (objectWriter != null && !(objectWriter instanceof ObjectWriterImplEnum)) {
+                    writeEnumAsJavaBean = true;
+                }
+            }
+
+            Member enumValueField = BeanUtils.getEnumValueField(fieldClass, provider);
+            if (enumValueField == null && !writeEnumAsJavaBean) {
+                return new FIeldWriterEnumField(fieldName, ordinal, features, format, label, fieldClass, field);
+            }
         }
 
         if (fieldClass == List.class || fieldClass == ArrayList.class) {