Merge pull request #6171 from abpframework/maliming/patch-1

Rename AbpExtraPropertyDictionaryJsonConverter to AbpHasExtraPropertiesJsonConverter.

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs

@@ -29,7 +29,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
             options.JsonSerializerOptions.Converters.Add(new AbpStringToBooleanConverter());
 
             options.JsonSerializerOptions.Converters.Add(new ObjectToInferredTypesConverter());
-            options.JsonSerializerOptions.Converters.Add(new AbpExtraPropertyDictionaryJsonConverterFactory());
+            options.JsonSerializerOptions.Converters.Add(new AbpHasExtraPropertiesJsonConverterFactory());
         }
     }
 }

framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/AbpSystemTextJsonSerializerOptionsSetup.cs

@@ -23,7 +23,7 @@ namespace Volo.Abp.Json.SystemTextJson
             options.JsonSerializerOptions.Converters.Add(new AbpStringToBooleanConverter());
 
             options.JsonSerializerOptions.Converters.Add(new ObjectToInferredTypesConverter());
-            options.JsonSerializerOptions.Converters.Add(new AbpExtraPropertyDictionaryJsonConverterFactory());
+            options.JsonSerializerOptions.Converters.Add(new AbpHasExtraPropertiesJsonConverterFactory());
         }
     }
 }

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

@@ -1,26 +0,0 @@
-using System;
-using System.Reflection;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Volo.Abp.ObjectExtending;
-
-namespace Volo.Abp.Json.SystemTextJson.JsonConverters
-{
-    public class AbpExtraPropertyDictionaryJsonConverterFactory : JsonConverterFactory
-    {
-        public override bool CanConvert(Type typeToConvert)
-        {
-            return typeToConvert == typeof(ExtensibleObject) || typeToConvert.IsSubclassOf(typeof(ExtensibleObject));
-        }
-
-        public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
-        {
-            return (JsonConverter) Activator.CreateInstance(
-                typeof(AbpExtraPropertyDictionaryJsonConverter<>).MakeGenericType(typeToConvert),
-                BindingFlags.Instance | BindingFlags.Public,
-                binder: null,
-                null,
-                culture: null)!;
-        }
-    }
-}

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

@@ -1,30 +1,27 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.Json.SystemTextJson.JsonConverters
 {
-    public class AbpExtraPropertyDictionaryJsonConverter<T> : JsonConverter<T>
+    public class AbpHasExtraPropertiesJsonConverter<T> : JsonConverter<T>
-        where T : ExtensibleObject
+        where T : IHasExtraProperties
     {
         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             var newOptions = JsonSerializerOptionsHelper.Create(options, x =>
                 x == this ||
-                x.GetType() == typeof(AbpExtraPropertyDictionaryJsonConverterFactory));
+                x.GetType() == typeof(AbpHasExtraPropertiesJsonConverterFactory));
 
             var rootElement = JsonDocument.ParseValue(ref reader).RootElement;
             var extensibleObject = JsonSerializer.Deserialize<T>(rootElement.GetRawText(), newOptions);
+
             var extraProperties = rootElement.EnumerateObject().FirstOrDefault(x =>
-                    x.Name.Equals(nameof(ExtensibleObject.ExtraProperties), StringComparison.OrdinalIgnoreCase))
+                    x.Name.Equals(nameof(IHasExtraProperties.ExtraProperties), StringComparison.OrdinalIgnoreCase))
                 .Value.GetRawText();
-
             var extraPropertyDictionary = JsonSerializer.Deserialize(extraProperties, typeof(ExtraPropertyDictionary), newOptions);
-
             ObjectHelper.TrySetProperty(extensibleObject, x => x.ExtraProperties, () => extraPropertyDictionary);
 
             return extensibleObject;
@@ -34,7 +31,7 @@ namespace Volo.Abp.Json.SystemTextJson.JsonConverters
         {
             var newOptions = JsonSerializerOptionsHelper.Create(options, x =>
                 x == this ||
-                x.GetType() == typeof(AbpExtraPropertyDictionaryJsonConverterFactory));
+                x.GetType() == typeof(AbpHasExtraPropertiesJsonConverterFactory));
 
             JsonSerializer.Serialize(writer, value, newOptions);
         }

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

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Concurrent;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.Json.SystemTextJson.JsonConverters
+{
+    public class AbpHasExtraPropertiesJsonConverterFactory : JsonConverterFactory
+    {
+        private static readonly ConcurrentDictionary<Type, bool> CachedTypes = new ConcurrentDictionary<Type, bool>();
+
+        public override bool CanConvert(Type typeToConvert)
+        {
+            //Only for private or protected ExtraProperties.
+            if (typeof(IHasExtraProperties).IsAssignableFrom(typeToConvert))
+            {
+                return CachedTypes.GetOrAdd(typeToConvert, type =>
+                {
+                    var property = type.GetProperty(nameof(IHasExtraProperties.ExtraProperties));
+                    if (property != null)
+                    {
+                        var setMethod = property.GetSetMethod(true);
+                        return setMethod != null && (setMethod.IsPrivate || setMethod.IsFamily);
+                    }
+
+                    return false;
+                });
+            }
+
+            return false;
+        }
+
+        public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        {
+            return (JsonConverter) Activator.CreateInstance(
+                typeof(AbpHasExtraPropertiesJsonConverter<>).MakeGenericType(typeToConvert),
+                BindingFlags.Instance | BindingFlags.Public,
+                binder: null,
+                null,
+                culture: null)!;
+        }
+    }
+}