Use non-static to store excluded types.

Author: maliming

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

@@ -11,11 +11,23 @@ public class AbpHasExtraPropertiesJsonConverter<T> : JsonConverter<T>
     {
         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            var newOptions = JsonSerializerOptionsHelper.Create(options, x =>
-                x == this ||
-                x.GetType() == typeof(AbpHasExtraPropertiesJsonConverterFactory));
+            var newOptions = JsonSerializerOptionsHelper.Create(options, x => x == this);
+
+            var converterFactory = newOptions.Converters.FirstOrDefault(x => x is AbpHasExtraPropertiesJsonConverterFactory).As<AbpHasExtraPropertiesJsonConverterFactory>();
+            var newConverterFactory = new AbpHasExtraPropertiesJsonConverterFactory();
+            if (converterFactory != null)
+            {
+                newOptions.Converters.Remove(converterFactory);
+                newConverterFactory.AddExcludeTypes(converterFactory.GetExcludeTypes().ToArray());
+            }
+            else
+            {
+                newConverterFactory.AddExcludeTypes(typeToConvert);
+            }
+
+            newConverterFactory.AddExcludeTypes(typeToConvert);
+            newOptions.Converters.Add(newConverterFactory);
 
-            newOptions.Converters.Add(new AbpHasExtraPropertiesJsonConverterFactory(typeToConvert));
             var rootElement = JsonDocument.ParseValue(ref reader).RootElement;
             if (rootElement.ValueKind == JsonValueKind.Object)
             {

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -12,16 +13,22 @@ public class AbpHasExtraPropertiesJsonConverterFactory : JsonConverterFactory
     {
         private static readonly ConcurrentDictionary<Type, bool> CachedTypes = new ConcurrentDictionary<Type, bool>();
 
-        private static readonly List<Type> ExcludeTypes = new List<Type>();
+        private readonly List<Type> _excludeTypes = new List<Type>();
 
-        public AbpHasExtraPropertiesJsonConverterFactory(params Type[] excludeTypes)
+        public virtual AbpHasExtraPropertiesJsonConverterFactory AddExcludeTypes(params Type[] excludeTypes)
         {
-            ExcludeTypes.AddIfNotContains(excludeTypes);
+            _excludeTypes.AddIfNotContains(excludeTypes);
+            return this;
+        }
+
+        public virtual IReadOnlyList<Type> GetExcludeTypes()
+        {
+            return _excludeTypes.ToImmutableList();
         }
 
         public override bool CanConvert(Type typeToConvert)
         {
-            if (ExcludeTypes.Contains(typeToConvert))
+            if (_excludeTypes.Contains(typeToConvert))
             {
                 return false;
             }

framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpHasExtraPropertiesJsonConverter_Tests.cs

@@ -43,6 +43,22 @@ public void JsonConverter_Test()
             fooDto.BarDtos.Count.ShouldBe(1);
             fooDto.BarDtos.First().Name.ShouldBe("bar-dto");
             fooDto.BarDtos.First().GetProperty("bar").ShouldBe("bar-value");
+
+            fooDto.Name = "new-foo-dto";
+            fooDto.SetProperty("foo", "new-foo-value");
+            fooDto.BarDtos.First().Name = "new-bar-dto";
+            fooDto.BarDtos.First().SetProperty("bar", "new-bar-value");
+
+            json = _jsonSerializer.Serialize(fooDto);
+
+            fooDto = _jsonSerializer.Deserialize<FooDto>(json);
+            fooDto.ShouldNotBeNull();
+            fooDto.Name.ShouldBe("new-foo-dto");
+            fooDto.GetProperty("foo").ShouldBe("new-foo-value");
+
+            fooDto.BarDtos.Count.ShouldBe(1);
+            fooDto.BarDtos.First().Name.ShouldBe("new-bar-dto");
+            fooDto.BarDtos.First().GetProperty("bar").ShouldBe("new-bar-value");
         }
     }