From e26d693ca309c52211e167dd6af1f465c7d76b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 3 May 2020 00:55:05 +0300
Subject: [PATCH] Refactor module entity extensions

---
 .../CachedObjectExtensionsDtoService.cs               |  2 +-
 .../ModuleEntityObjectExtensionConfiguration.cs       |  4 ++--
 ...uleEntityObjectExtensionConfigurationDictionary.cs |  9 +++++++++
 ...yObjectPropertyExtensionConfigurationDictionary.cs |  9 +++++++++
 .../Modularity/ModuleObjectExtensionConfiguration.cs  | 11 +++++++----
 .../ModuleObjectExtensionConfigurationExtensions.cs   |  2 +-
 .../ModuleObjectExtensionConfigurationHelper.cs       |  2 +-
 7 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfigurationDictionary.cs
 create mode 100644 framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectPropertyExtensionConfigurationDictionary.cs

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs
index 197ae6d07d..766be2e42b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs
@@ -44,7 +44,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
                     Objects = new Dictionary<string, ModuleObjectExtensionDto>()
                 };
 
-                foreach (var objectConfig in moduleConfig.Value)
+                foreach (var objectConfig in moduleConfig.Value.Entities)
                 {
                     var moduleObjectExtensionDto = moduleExtensionDto.Objects[objectConfig.Key] =
                         new ModuleObjectExtensionDto
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfiguration.cs
index 3e1c3ef136..2c7beaa0e4 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfiguration.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfiguration.cs
@@ -8,14 +8,14 @@ namespace Volo.Abp.ObjectExtending.Modularity
     public class ModuleEntityObjectExtensionConfiguration
     {
         [NotNull]
-        protected Dictionary<string, ModuleEntityObjectPropertyExtensionConfiguration> Properties { get; }
+        protected ModuleEntityObjectPropertyExtensionConfigurationDictionary Properties { get; }
 
         [NotNull]
         public List<Action<ObjectExtensionValidationContext>> Validators { get; }
 
         public ModuleEntityObjectExtensionConfiguration()
         {
-            Properties = new Dictionary<string, ModuleEntityObjectPropertyExtensionConfiguration>();
+            Properties = new ModuleEntityObjectPropertyExtensionConfigurationDictionary();
             Validators = new List<Action<ObjectExtensionValidationContext>>();
         }
 
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfigurationDictionary.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfigurationDictionary.cs
new file mode 100644
index 0000000000..73d78b808e
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfigurationDictionary.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ModuleEntityObjectExtensionConfigurationDictionary : Dictionary<string, ModuleEntityObjectExtensionConfiguration>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectPropertyExtensionConfigurationDictionary.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectPropertyExtensionConfigurationDictionary.cs
new file mode 100644
index 0000000000..4b7e7e3ddb
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectPropertyExtensionConfigurationDictionary.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ModuleEntityObjectPropertyExtensionConfigurationDictionary : Dictionary<string, ModuleEntityObjectPropertyExtensionConfiguration>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfiguration.cs
index 67453f8188..14470d1a17 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfiguration.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfiguration.cs
@@ -1,9 +1,12 @@
-using System.Collections.Generic;
-
-namespace Volo.Abp.ObjectExtending.Modularity
+namespace Volo.Abp.ObjectExtending.Modularity
 {
-    public class ModuleObjectExtensionConfiguration : Dictionary<string, ModuleEntityObjectExtensionConfiguration>
+    public class ModuleObjectExtensionConfiguration
     {
+        public ModuleEntityObjectExtensionConfigurationDictionary Entities { get; set; }
 
+        public ModuleObjectExtensionConfiguration()
+        {
+            Entities = new ModuleEntityObjectExtensionConfigurationDictionary();
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationExtensions.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationExtensions.cs
index 218c66344e..137002418a 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationExtensions.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationExtensions.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp.ObjectExtending.Modularity
             Action<ModuleEntityObjectExtensionConfiguration> configureAction)
             where T : ModuleObjectExtensionConfiguration
         {
-            var configuration = objectConfiguration.GetOrAdd(
+            var configuration = objectConfiguration.Entities.GetOrAdd(
                 objectName,
                 () => new ModuleEntityObjectExtensionConfiguration()
             );
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationHelper.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationHelper.cs
index 6df0e58fb0..a975f00102 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationHelper.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationHelper.cs
@@ -128,7 +128,7 @@ namespace Volo.Abp.ObjectExtending.Modularity
                 return Array.Empty<ModuleEntityObjectPropertyExtensionConfiguration>();
             }
 
-            var objectConfig = moduleConfig.GetOrDefault(objectName);
+            var objectConfig = moduleConfig.Entities.GetOrDefault(objectName);
             if (objectConfig == null)
             {
                 return Array.Empty<ModuleEntityObjectPropertyExtensionConfiguration>();