FieldWriterUUID

Author: wenshao

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

@@ -43,18 +43,8 @@ public boolean write(JSONWriter jsonWriter, T object) {
                 return false;
             }
         }
-
         writeFieldName(jsonWriter);
-
-        if (objectWriter == null) {
-            objectWriter = getObjectWriter(jsonWriter, UUID.class);
-        }
-
-        if (objectWriter != ObjectWriterImplUUID.INSTANCE) {
-            objectWriter.write(jsonWriter, uuid, fieldName, fieldClass, features);
-        } else {
-            jsonWriter.writeUUID(uuid);
-        }
+        jsonWriter.writeUUID(uuid);
         return true;
     }
 

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

@@ -1125,7 +1125,7 @@ public <T> FieldWriter<T> createFieldWriter(
             return new FieldWriterOffsetDateTime(fieldName, ordinal, features, format, locale, label, fieldType, fieldClass, field, null, null);
         }
 
-        if (fieldClass == UUID.class) {
+        if (fieldClass == UUID.class && isDefaultUUIDObjectWriter(provider)) {
             return new FieldWriterUUID(fieldName, ordinal, features, format, label, fieldType, fieldClass, field, null, null);
         }
 
@@ -1433,7 +1433,7 @@ public <T> FieldWriter<T> createFieldWriter(
             return new FieldWriterOffsetDateTime(fieldName, ordinal, features, format, locale, label, fieldType, fieldClass, field, method, null);
         }
 
-        if (fieldClass == UUID.class) {
+        if (fieldClass == UUID.class && isDefaultUUIDObjectWriter(provider)) {
             return new FieldWriterUUID(fieldName, ordinal, features, format, label, fieldType, fieldClass, field, method, null);
         }
 
@@ -1583,7 +1583,7 @@ public <T, V> FieldWriter createFieldWriter(
             Class fieldClass,
             Function<T, V> function
     ) {
-        return createFieldWriter(null, null, fieldName, 0, 0, null, null, fieldClass, fieldClass, null, function);
+        return createFieldWriter(JSONFactory.getDefaultObjectWriterProvider(), null, fieldName, 0, 0, null, null, fieldClass, fieldClass, null, function);
     }
 
     /**
@@ -1865,7 +1865,7 @@ public <T, V> FieldWriter<T> createFieldWriter(
             return new FieldWriterOffsetDateTime(fieldName, ordinal, features, format, locale, label, fieldType, fieldClass, field, method, function);
         }
 
-        if (fieldClass == UUID.class) {
+        if (fieldClass == UUID.class && isDefaultUUIDObjectWriter(provider)) {
             return new FieldWriterUUID(fieldName, ordinal, features, format, label, fieldType, fieldClass, field, method, function);
         }
 
@@ -1924,6 +1924,10 @@ public <T, V> FieldWriter<T> createFieldWriter(
         return new FieldWriterObject(fieldName, ordinal, features, format, locale, label, fieldType, fieldClass, field, method, function);
     }
 
+    private static boolean isDefaultUUIDObjectWriter(ObjectWriterProvider provider) {
+        return provider.getObjectWriter(UUID.class) == ObjectWriterImplUUID.INSTANCE;
+    }
+
     static class LambdaInfo {
         final Class fieldClass;
         final Class supplierClass;