From 36097d2e402df345eaf16b98ae9a577f81612f13 Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Tue, 2 Mar 2021 18:06:30 +0300
Subject: [PATCH 1/2] PropertyNameGenerator moved to static class

---
 .../Modeling/PropertyApiDescriptionModel.cs   |  2 +-
 .../AbpApiPropertyNameConfiguration.cs        | 32 +++++++++++++++++++
 .../AbpApiProxyScriptingOptions.cs            | 25 ---------------
 3 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiPropertyNameConfiguration.cs

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
index 678798ae39..8eb307c630 100644
--- 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 @@ namespace Volo.Abp.Http.Modeling
             return new PropertyApiDescriptionModel
             {
                 Name = propertyInfo.Name,
-                JsonName = AbpApiProxyScriptingOptions.PropertyNameGenerator.Invoke(propertyInfo),
+                JsonName = AbpApiPropertyNameConfiguration.PropertyNameGenerator.Invoke(propertyInfo),
                 Type = ApiTypeNameHelper.GetTypeName(propertyInfo.PropertyType),
                 TypeSimple = ApiTypeNameHelper.GetSimpleTypeName(propertyInfo.PropertyType),
                 IsRequired = propertyInfo.IsDefined(typeof(RequiredAttribute), true)
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiPropertyNameConfiguration.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiPropertyNameConfiguration.cs
new file mode 100644
index 0000000000..4320e9905f
--- /dev/null
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiPropertyNameConfiguration.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Reflection;
+
+namespace Volo.Abp.Http.ProxyScripting.Configuration
+{
+    public static class AbpApiPropertyNameConfiguration
+    {
+        public static Func<PropertyInfo, string> PropertyNameGenerator { get; set; }
+        
+        static AbpApiPropertyNameConfiguration()
+        {
+            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;
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingOptions.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingOptions.cs
index 76c7dc74f5..e698d00416 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingOptions.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingOptions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 
 namespace Volo.Abp.Http.ProxyScripting.Configuration
 {
@@ -8,30 +7,6 @@ namespace Volo.Abp.Http.ProxyScripting.Configuration
     {
         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>();

From dc95eabf4305bace4a20100c82ae32f7f9325dfd Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Tue, 2 Mar 2021 18:10:29 +0300
Subject: [PATCH 2/2] rename configuration class name

---
 .../Volo/Abp/Http/Modeling/PropertyApiDescriptionModel.cs     | 2 +-
 ...eConfiguration.cs => AbpApiProxyScriptingConfiguration.cs} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/{AbpApiPropertyNameConfiguration.cs => AbpApiProxyScriptingConfiguration.cs} (89%)

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
index 8eb307c630..fc9f13edbc 100644
--- 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 @@ namespace Volo.Abp.Http.Modeling
             return new PropertyApiDescriptionModel
             {
                 Name = propertyInfo.Name,
-                JsonName = AbpApiPropertyNameConfiguration.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/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiPropertyNameConfiguration.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingConfiguration.cs
similarity index 89%
rename from framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiPropertyNameConfiguration.cs
rename to framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingConfiguration.cs
index 4320e9905f..1f17d0d2cf 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiPropertyNameConfiguration.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Configuration/AbpApiProxyScriptingConfiguration.cs
@@ -3,11 +3,11 @@ using System.Reflection;
 
 namespace Volo.Abp.Http.ProxyScripting.Configuration
 {
-    public static class AbpApiPropertyNameConfiguration
+    public static class AbpApiProxyScriptingConfiguration
     {
         public static Func<PropertyInfo, string> PropertyNameGenerator { get; set; }
         
-        static AbpApiPropertyNameConfiguration()
+        static AbpApiProxyScriptingConfiguration()
         {
             PropertyNameGenerator = propertyInfo =>
             {