Provide type as hint to JsonSerializer

Pass the `Type` value to `JsonSerializer` to give a hint as to how to serialize the value. See #2593 (comment).
domaindrivendev · Apr 23, 2024 · 4a374da · 4a374da
1 parent 6c462f3
commit 4a374da
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonSerializerDataContractResolver.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonSerializerDataContractResolver.cs
@@ -24,16 +24,16 @@ public DataContract GetDataContractForType(Type type)
             {
                 return DataContract.ForDynamic(
                     underlyingType: type,
-                    jsonConverter: JsonConverterFunc);
+                    jsonConverter: (value) => JsonConverterFunc(value, type));
             }
 
-            if (PrimitiveTypesAndFormats.TryGetValue(type, out var primitiveTypeAndFormat1))
+            if (PrimitiveTypesAndFormats.TryGetValue(type, out var primitiveTypeAndFormat))
             {
                 return DataContract.ForPrimitive(
                     underlyingType: type,
-                    dataType: primitiveTypeAndFormat1.Item1,
-                    dataFormat: primitiveTypeAndFormat1.Item2,
-                    jsonConverter: JsonConverterFunc);
+                    dataType: primitiveTypeAndFormat.Item1,
+                    dataFormat: primitiveTypeAndFormat.Item2,
+                    jsonConverter: (value) => JsonConverterFunc(value, type));
             }
 
             if (type.IsEnum)
@@ -42,17 +42,17 @@ public DataContract GetDataContractForType(Type type)
 
                 //Test to determine if the serializer will treat as string
                 var serializeAsString = (enumValues.Length > 0)
-                    && JsonConverterFunc(enumValues.GetValue(0)).StartsWith("\"");
+                    && JsonConverterFunc(enumValues.GetValue(0), type).StartsWith("\"");
 
-                var primitiveTypeAndFormat = serializeAsString
+                primitiveTypeAndFormat = serializeAsString
                     ? PrimitiveTypesAndFormats[typeof(string)]
                     : PrimitiveTypesAndFormats[type.GetEnumUnderlyingType()];
 
                 return DataContract.ForPrimitive(
                     underlyingType: type,
                     dataType: primitiveTypeAndFormat.Item1,
                     dataFormat: primitiveTypeAndFormat.Item2,
-                    jsonConverter: JsonConverterFunc);
+                    jsonConverter: (value) => JsonConverterFunc(value, type));
             }
 
             if (IsSupportedDictionary(type, out Type keyType, out Type valueType))
@@ -61,27 +61,27 @@ public DataContract GetDataContractForType(Type type)
                     underlyingType: type,
                     valueType: valueType,
                     keys: null, // STJ doesn't currently support dictionaries with enum key types
-                    jsonConverter: JsonConverterFunc);
+                    jsonConverter: (value) => JsonConverterFunc(value, type));
             }
 
             if (IsSupportedCollection(type, out Type itemType))
             {
                 return DataContract.ForArray(
                     underlyingType: type,
                     itemType: itemType,
-                    jsonConverter: JsonConverterFunc);
+                    jsonConverter: (value) => JsonConverterFunc(value, type));
             }
 
             return DataContract.ForObject(
                 underlyingType: type,
                 properties: GetDataPropertiesFor(type, out Type extensionDataType),
                 extensionDataType: extensionDataType,
-                jsonConverter: JsonConverterFunc);
+                jsonConverter: (value) => JsonConverterFunc(value, type));
         }
 
-        private string JsonConverterFunc(object value)
+        private string JsonConverterFunc(object value, Type type)
         {
-            return JsonSerializer.Serialize(value, _serializerOptions);
+            return JsonSerializer.Serialize(value, type, _serializerOptions);
         }
 
         public bool IsSupportedDictionary(Type type, out Type keyType, out Type valueType)