Merge pull request #17146 from abpframework/auto-merge/rel-7-1/2076

Merge branch rel-7.2 with rel-7.1

framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpNullableStringToGuidConverter.cs

@@ -6,8 +6,6 @@ namespace Volo.Abp.Json.SystemTextJson.JsonConverters;
 
 public class AbpNullableStringToGuidConverter : JsonConverter<Guid?>
 {
-    private JsonSerializerOptions _writeJsonSerializerOptions;
-
     public override Guid? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         if (reader.TokenType == JsonTokenType.String)
@@ -33,9 +31,13 @@ public class AbpNullableStringToGuidConverter : JsonConverter<Guid?>
 
     public override void Write(Utf8JsonWriter writer, Guid? value, JsonSerializerOptions options)
     {
-        _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(options, this);
+        if (value == null)
-        var entityConverter = (JsonConverter<Guid?>)_writeJsonSerializerOptions.GetConverter(typeof(Guid?));
+        {
-
+            writer.WriteNullValue();
-        entityConverter.Write(writer, value, _writeJsonSerializerOptions);
+        }
+        else
+        {
+            writer.WriteStringValue(value.Value);
+        }
     }
 }

framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToBooleanConverter.cs

@@ -8,8 +8,6 @@ namespace Volo.Abp.Json.SystemTextJson.JsonConverters;
 
 public class AbpStringToBooleanConverter : JsonConverter<bool>
 {
-    private JsonSerializerOptions _writeJsonSerializerOptions;
-
     public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         if (reader.TokenType == JsonTokenType.String)
@@ -31,9 +29,6 @@ public class AbpStringToBooleanConverter : JsonConverter<bool>
 
     public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
     {
-        _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(options, this);
+        writer.WriteBooleanValue(value);
-        var entityConverter = (JsonConverter<bool>)_writeJsonSerializerOptions.GetConverter(typeof(bool));
-
-        entityConverter.Write(writer, value, _writeJsonSerializerOptions);
     }
 }

framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs

@@ -11,8 +11,6 @@ public class AbpStringToEnumConverter<T> : JsonConverter<T>
 
     private JsonSerializerOptions _readJsonSerializerOptions;
 
-    private JsonSerializerOptions _writeJsonSerializerOptions;
-
     public AbpStringToEnumConverter()
         : this(namingPolicy: null, allowIntegerValues: true)
     {
@@ -41,11 +39,7 @@ public class AbpStringToEnumConverter<T> : JsonConverter<T>
 
     public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
     {
-        _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(options, x =>
+        JsonSerializer.Serialize(writer, value);
-            x == this ||
-            x.GetType() == typeof(AbpStringToEnumFactory));
-
-        JsonSerializer.Serialize(writer, value, _writeJsonSerializerOptions);
     }
 
     public override T ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)

framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToGuidConverter.cs

@@ -6,8 +6,6 @@ namespace Volo.Abp.Json.SystemTextJson.JsonConverters;
 
 public class AbpStringToGuidConverter : JsonConverter<Guid>
 {
-    private JsonSerializerOptions _writeJsonSerializerOptions;
-
     public override Guid Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         if (reader.TokenType == JsonTokenType.String)
@@ -28,9 +26,6 @@ public class AbpStringToGuidConverter : JsonConverter<Guid>
 
     public override void Write(Utf8JsonWriter writer, Guid value, JsonSerializerOptions options)
     {
-        _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(options, this);
+        writer.WriteStringValue(value);
-        var entityConverter = (JsonConverter<Guid>)_writeJsonSerializerOptions.GetConverter(typeof(Guid));
-
-        entityConverter.Write(writer, value, _writeJsonSerializerOptions);
     }
 }

framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/JsonConverters/EntityJsonConverter.cs

@@ -8,8 +8,6 @@ namespace Volo.Abp.MemoryDb.JsonConverters;
 public class EntityJsonConverter<TEntity, TKey> : JsonConverter<TEntity>
     where TEntity : Entity<TKey>
 {
-    private JsonSerializerOptions _writeJsonSerializerOptions;
-
     public override TEntity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var jsonDocument = JsonDocument.ParseValue(ref reader);
@@ -34,7 +32,6 @@ public class EntityJsonConverter<TEntity, TKey> : JsonConverter<TEntity>
 
     public override void Write(Utf8JsonWriter writer, TEntity value, JsonSerializerOptions options)
     {
-        _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(options, this);
+        JsonSerializer.Serialize(writer, value, JsonSerializerOptionsHelper.Create(options, this));
-        JsonSerializer.Serialize(writer, value, _writeJsonSerializerOptions);
     }
 }