Added IConfigurationHelper interface to dynamically choose the method…

… to call given arguments.
almostchristian · Oct 23, 2022 · f30f420 · f30f420
1 parent 3b804aa
commit f30f420
Show file tree

Hide file tree

Showing 8 changed files with 343 additions and 151 deletions.
diff --git a/src/ConfigurationProcessor.Core/IConfigurationProcessor.cs b/src/ConfigurationProcessor.Core/IConfigurationProcessor.cs
@@ -0,0 +1,26 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) almostchristian. All rights reserved.
+// -------------------------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ConfigurationProcessor
+{
+   /// <summary>
+   /// Represents a configuration helper for dynamically executing methods.
+   /// </summary>
+   public interface IConfigurationProcessor
+   {
+      /// <summary>
+      /// Invokes a specificed configuration method with specificed arguments. Method is chosen based on the argument types.
+      /// </summary>
+      /// <typeparam name="T"></typeparam>
+      /// <param name="instance"></param>
+      /// <param name="methodName"></param>
+      /// <param name="arguments"></param>
+      void Invoke<T>(T instance, string methodName, params object[] arguments)
+         where T : class;
+   }
+}
diff --git a/src/ConfigurationProcessor.Core/Implementation/ConfigurationHelperImplementation.cs b/src/ConfigurationProcessor.Core/Implementation/ConfigurationHelperImplementation.cs
@@ -0,0 +1,50 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) almostchristian. All rights reserved.
+// -------------------------------------------------------------------------------------------------
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.Extensions.Configuration;
+
+namespace ConfigurationProcessor.Core.Implementation
+{
+   internal class ConfigurationHelperImplementation : IConfigurationProcessor
+   {
+      private readonly ResolutionContext resolutionContext;
+      private readonly IConfigurationSection configurationSection;
+      private readonly ConfigurationReaderOptions? options;
+
+      public ConfigurationHelperImplementation(ResolutionContext resolutionContext, IConfigurationSection configurationSection, ConfigurationReaderOptions? options)
+      {
+         this.resolutionContext = resolutionContext;
+         this.configurationSection = configurationSection;
+         this.options = options;
+      }
+
+      public void Invoke<T>(T instance, string methodName, params object[] arguments)
+         where T : class
+      {
+         resolutionContext.CallConfigurationMethod(
+            typeof(T),
+            methodName,
+            configurationSection,
+            null,
+            Array.Empty<TypeResolver>(),
+            null!,
+            () => arguments.ToList(),
+            (arguments, methodInfo) =>
+            {
+               if (methodInfo.IsStatic)
+               {
+                  arguments.Insert(0, instance);
+                  methodInfo.Invoke(null, arguments.ToArray());
+               }
+               else
+               {
+                  methodInfo.Invoke(instance, arguments.ToArray());
+               }
+            });
+      }
+   }
+}
diff --git a/src/ConfigurationProcessor.Core/Implementation/ConfigurationReader{TConfig}.cs b/src/ConfigurationProcessor.Core/Implementation/ConfigurationReader{TConfig}.cs
@@ -23,10 +23,11 @@ public void AddServices(TConfig builder, string? sectionName, bool getChildren,
          var builderDirective = string.IsNullOrEmpty(sectionName) ? ConfigurationSection : ConfigurationSection.GetSection(sectionName);
          if (!getChildren || builderDirective.GetChildren().Any())
          {
-            var methodCalls = ResolutionContext.GetMethodCalls(builderDirective, getChildren);
             ResolutionContext.CallConfigurationMethods(
                typeof(TConfig),
-               methodCalls,
+               builderDirective,
+               getChildren,
+               null,
                options.MethodFilterFactory,
                (arguments, methodInfo) =>
                {

diff --git a/src/ConfigurationProcessor.Core/Implementation/Extensions.cs b/src/ConfigurationProcessor.Core/Implementation/Extensions.cs
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,7 +5,7 @@
    </PropertyGroup>
 
    <PropertyGroup>
-      <Version>1.5.1</Version>
+      <Version>1.6.0</Version>
       <FileVersion>$(Version).$([System.DateTime]::Now.ToString(yy))$([System.DateTime]::Now.DayOfYear.ToString(000))</FileVersion>
       <PackageVersion>$(Version)</PackageVersion>
       <InformationalVersion>$(FileVersion)-$(GIT_VERSION)</InformationalVersion>
@@ -23,6 +23,8 @@
       <PackageTags>dependencyinjection;configuration;ioc;di;</PackageTags>
       <PackageReadmeFile>README.md</PackageReadmeFile>
       <PackageReleaseNotes>
+v1.6.0
+   - Added IConfigurationProcessor interface to dynamically call methods
 v1.5.1
    - Fixed exception with optional parameters
 v1.5.0

diff --git a/tests/ConfigurationProcessor.DependencyInjection.UnitTests/ConfigurationBuilderTestsBase.cs b/tests/ConfigurationProcessor.DependencyInjection.UnitTests/ConfigurationBuilderTestsBase.cs
@@ -1283,6 +1283,42 @@ public void WithObjectNotation_CallExtensionMethodOnConfigurationObject_Executes
          Assert.Equal("helloworld2314", option.Value.Name);
       }
 
+      [Fact]
+      public void WithObjectNotation_UsingHelper_CallsDynamicAddConfigureName()
+      {
+         var randomValue = Guid.NewGuid().ToString();
+         var json = @$"
+{{
+   'WithHelper': '{randomValue}'
+}}";
+
+         var sp = BuildFromJson(json);
+         var option = sp.GetService<IOptions<ComplexObject>>();
+
+         Assert.NotNull(option);
+         Assert.Equal(randomValue, option.Value.Name);
+      }
+
+      [Theory]
+      [InlineData("Time")]
+      [InlineData("Time2")]
+      public void WithObjectNotation_UsingHelperWithComplexOptions_CallsDynamicAddConfigureName(string timeProperty)
+      {
+         var randomValue = Guid.NewGuid().ToString();
+         var json = @$"
+{{
+   'WithHelper': {{
+      '{timeProperty}' : '13:00:10'
+   }}
+}}";
+
+         var sp = BuildFromJson(json);
+         var option = sp.GetService<IOptions<ComplexObject>>();
+
+         Assert.NotNull(option);
+         Assert.Equal(new TimeSpan(13, 0, 10), option.Value.Value.Time);
+      }
+
       private IServiceProvider BuildFromJson(string json)
       {
          var serviceCollection = ProcessJson(json);

diff --git a/tests/TestDummies/DummyServiceCollectionExtensions.cs b/tests/TestDummies/DummyServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Integrated Health Information Systems Pte Ltd. All rights reserved.
 // -------------------------------------------------------------------------------------------------
 
+using ConfigurationProcessor;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
@@ -275,5 +276,17 @@ public static void Append<T>(this ComplexObject obj, string value)
       {
          obj.Name += value;
       }
+
+      public static IServiceCollection AddWithHelper(this IServiceCollection services, string text, IConfigurationProcessor helper)
+      {
+         services.AddConfigurationAction(c => helper.Invoke(c, "AddConfigureName", text));
+         return services;
+      }
+
+      public static IServiceCollection AddWithHelper(this IServiceCollection services, Action<ComplexObject.ChildValue> configure, IConfigurationProcessor helper)
+      {
+         services.AddConfigurationAction(c => helper.Invoke(c, "AddConfigureValue", configure));
+         return services;
+      }
    }
 }
diff --git a/tests/TestDummies/TestDummies.csproj b/tests/TestDummies/TestDummies.csproj
@@ -12,4 +12,8 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\ConfigurationProcessor.Core\ConfigurationProcessor.Core.csproj" />
+  </ItemGroup>
+
 </Project>