Browse Source

Refactor module entity extensions

pull/3834/head
Halil İbrahim Kalkan 7 years ago
parent
commit
e26d693ca3
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs
  2. 4
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfiguration.cs
  3. 9
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfigurationDictionary.cs
  4. 9
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectPropertyExtensionConfigurationDictionary.cs
  5. 11
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfiguration.cs
  6. 2
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationExtensions.cs
  7. 2
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationHelper.cs

2
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>() Objects = new Dictionary<string, ModuleObjectExtensionDto>()
}; };
foreach (var objectConfig in moduleConfig.Value) foreach (var objectConfig in moduleConfig.Value.Entities)
{ {
var moduleObjectExtensionDto = moduleExtensionDto.Objects[objectConfig.Key] = var moduleObjectExtensionDto = moduleExtensionDto.Objects[objectConfig.Key] =
new ModuleObjectExtensionDto new ModuleObjectExtensionDto

4
framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleEntityObjectExtensionConfiguration.cs

@ -8,14 +8,14 @@ namespace Volo.Abp.ObjectExtending.Modularity
public class ModuleEntityObjectExtensionConfiguration public class ModuleEntityObjectExtensionConfiguration
{ {
[NotNull] [NotNull]
protected Dictionary<string, ModuleEntityObjectPropertyExtensionConfiguration> Properties { get; } protected ModuleEntityObjectPropertyExtensionConfigurationDictionary Properties { get; }
[NotNull] [NotNull]
public List<Action<ObjectExtensionValidationContext>> Validators { get; } public List<Action<ObjectExtensionValidationContext>> Validators { get; }
public ModuleEntityObjectExtensionConfiguration() public ModuleEntityObjectExtensionConfiguration()
{ {
Properties = new Dictionary<string, ModuleEntityObjectPropertyExtensionConfiguration>(); Properties = new ModuleEntityObjectPropertyExtensionConfigurationDictionary();
Validators = new List<Action<ObjectExtensionValidationContext>>(); Validators = new List<Action<ObjectExtensionValidationContext>>();
} }

9
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>
{
}
}

9
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>
{
}
}

11
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();
}
} }
} }

2
framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationExtensions.cs

@ -11,7 +11,7 @@ namespace Volo.Abp.ObjectExtending.Modularity
Action<ModuleEntityObjectExtensionConfiguration> configureAction) Action<ModuleEntityObjectExtensionConfiguration> configureAction)
where T : ModuleObjectExtensionConfiguration where T : ModuleObjectExtensionConfiguration
{ {
var configuration = objectConfiguration.GetOrAdd( var configuration = objectConfiguration.Entities.GetOrAdd(
objectName, objectName,
() => new ModuleEntityObjectExtensionConfiguration() () => new ModuleEntityObjectExtensionConfiguration()
); );

2
framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleObjectExtensionConfigurationHelper.cs

@ -128,7 +128,7 @@ namespace Volo.Abp.ObjectExtending.Modularity
return Array.Empty<ModuleEntityObjectPropertyExtensionConfiguration>(); return Array.Empty<ModuleEntityObjectPropertyExtensionConfiguration>();
} }
var objectConfig = moduleConfig.GetOrDefault(objectName); var objectConfig = moduleConfig.Entities.GetOrDefault(objectName);
if (objectConfig == null) if (objectConfig == null)
{ {
return Array.Empty<ModuleEntityObjectPropertyExtensionConfiguration>(); return Array.Empty<ModuleEntityObjectPropertyExtensionConfiguration>();

Loading…
Cancel
Save