Merge pull request #7916 from abpframework/cotur/api-scripting

PropertyNameGenerator moved to static class
abpframework · Mar 2, 2021 · c4b48bd · c4b48bd
2 parents 3b633f6 + dc95eab
commit c4b48bd
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/PropertyApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/PropertyApiDescriptionModel.cs
@@ -24,7 +24,7 @@ public static PropertyApiDescriptionModel Create(PropertyInfo propertyInfo)
             return new PropertyApiDescriptionModel
             {
                 Name = propertyInfo.Name,
-                JsonName = AbpApiProxyScriptingOptions.PropertyNameGenerator.Invoke(propertyInfo),
+                JsonName = AbpApiProxyScriptingConfiguration.PropertyNameGenerator.Invoke(propertyInfo),
                 Type = ApiTypeNameHelper.GetTypeName(propertyInfo.PropertyType),
                 TypeSimple = ApiTypeNameHelper.GetSimpleTypeName(propertyInfo.PropertyType),
                 IsRequired = propertyInfo.IsDefined(typeof(RequiredAttribute), true)

diff --git a/....Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingConfiguration.cs b/....Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingConfiguration.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Reflection;
+
+namespace Volo.Abp.Http.ProxyScripting.Configuration
+{
+    public static class AbpApiProxyScriptingConfiguration
+    {
+        public static Func<PropertyInfo, string> PropertyNameGenerator { get; set; }
+
+        static AbpApiProxyScriptingConfiguration()
+        {
+            PropertyNameGenerator = propertyInfo =>
+            {
+                var jsonPropertyNameAttribute = propertyInfo.GetSingleAttributeOrNull<System.Text.Json.Serialization.JsonPropertyNameAttribute>(true);
+
+                if (jsonPropertyNameAttribute != null)
+                {
+                    return jsonPropertyNameAttribute.Name;
+                }
+                
+                var jsonPropertyAttribute = propertyInfo.GetSingleAttributeOrNull<Newtonsoft.Json.JsonPropertyAttribute>(true);
+
+                if (jsonPropertyAttribute != null)
+                {
+                    return jsonPropertyAttribute.PropertyName;
+                }
+
+                return null;
+            };
+        }
+    }
+}
diff --git a/...c/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingOptions.cs b/...c/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingOptions.cs
@@ -1,37 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 
 namespace Volo.Abp.Http.ProxyScripting.Configuration
 {
     public class AbpApiProxyScriptingOptions
     {
         public IDictionary<string, Type> Generators { get; }
 
-        public static Func<PropertyInfo, string> PropertyNameGenerator { get; set; }
-
-        static AbpApiProxyScriptingOptions()
-        {
-            PropertyNameGenerator = propertyInfo =>
-            {
-                var jsonPropertyNameAttribute = propertyInfo.GetSingleAttributeOrNull<System.Text.Json.Serialization.JsonPropertyNameAttribute>(true);
-
-                if (jsonPropertyNameAttribute != null)
-                {
-                    return jsonPropertyNameAttribute.Name;
-                }
-                
-                var jsonPropertyAttribute = propertyInfo.GetSingleAttributeOrNull<Newtonsoft.Json.JsonPropertyAttribute>(true);
-
-                if (jsonPropertyAttribute != null)
-                {
-                    return jsonPropertyAttribute.PropertyName;
-                }
-
-                return null;
-            };
-        }
-
         public AbpApiProxyScriptingOptions()
         {
             Generators = new Dictionary<string, Type>();