Allowed config file section handler for app.config to defined typed elements as parameter collections themselves

johelvisguzman · johelvisguzman · commit 6b724e4a4329 · 2020-01-13T15:01:44.000-05:00
diff --git a/src/DotNetToolkit.Repository/Internal/ConfigFile/ConfigurationSection.cs b/src/DotNetToolkit.Repository/Internal/ConfigFile/ConfigurationSection.cs
@@ -37,19 +37,19 @@ public virtual RepositoryInterceptorElementCollection Interceptors
             get => (RepositoryInterceptorElementCollection)this[InterceptorsKey];
         }
 
-        [ConfigurationProperty(DefaultContextFactoryKey, IsRequired = false)]
+        [ConfigurationProperty(DefaultContextFactoryKey, IsRequired = false, IsDefaultCollection = false)]
         public virtual RepositoryContextFactoryElement DefaultContextFactory
         {
             get => (RepositoryContextFactoryElement)this[DefaultContextFactoryKey];
         }
 
-        [ConfigurationProperty(LoggingProviderKey, IsRequired = false)]
+        [ConfigurationProperty(LoggingProviderKey, IsRequired = false, IsDefaultCollection = false)]
         public virtual LoggingProviderElement LoggingProvider
         {
             get => (LoggingProviderElement)this[LoggingProviderKey];
         }
 
-        [ConfigurationProperty(CachingProviderKey, IsRequired = false)]
+        [ConfigurationProperty(CachingProviderKey, IsRequired = false, IsDefaultCollection = false)]
         public virtual CachingProviderElement CachingProvider
         {
             get => (CachingProviderElement)this[CachingProviderKey];
@@ -145,7 +145,7 @@ public string ValueString
 
     class ParameterCollection : ConfigurationElementCollection
     {
-        private const string ParameterKey = "parameter";
+        private const string ParameterKey = "param";
 
         public override ConfigurationElementCollectionType CollectionType
         {
@@ -168,10 +168,9 @@ protected override string ElementName
         }
     }
 
-    abstract class TypedConfigurationElementBase<T> : ConfigurationElement
+    abstract class TypedConfigurationElementBase<T> : ParameterCollection
     {
         private const string TypeKey = "type";
-        private const string ParametersKey = "parameters";
 
         private Type _type;
 
@@ -203,21 +202,14 @@ public Type Type
             }
         }
 
-        [ConfigurationProperty(ParametersKey, IsDefaultCollection = false)]
-        public ParameterCollection Parameters
-        {
-            get { return (ParameterCollection)this[ParametersKey]; }
-        }
-
         public virtual T GetTypedValue()
         {
             var type = Type;
 
             if (type == null)
                 return default(T);
 
-            var keyValues = Parameters
-                .Cast<ParameterElement>()
+            var keyValues = this.Cast<ParameterElement>()
                 .ToDictionary(x => x.Name, x => x.ValueString);
 
             if (!keyValues.Any())
diff --git a/test/DotNetToolkit.Repository.Test/App.config b/test/DotNetToolkit.Repository.Test/App.config
@@ -6,27 +6,19 @@
   </configSections>
   <repository>
     <defaultContextFactory type="DotNetToolkit.Repository.InMemory.Internal.InMemoryRepositoryContextFactory, DotNetToolkit.Repository.InMemory">
-      <parameters>
-        <parameter name="ignoreTransactionWarning" value="True" />
-        <parameter name="databaseName" value="__InMemoryDatabaseName__" />
-      </parameters>
+      <param name="ignoreTransactionWarning" value="True" />
+      <param name="databaseName" value="__InMemoryDatabaseName__" />
     </defaultContextFactory>
     <loggingProvider type="DotNetToolkit.Repository.Configuration.Logging.ConsoleLoggerProvider, DotNetToolkit.Repository">
-      <parameters>
-        <parameter name="minLogLevel" value="Debug" />
-      </parameters>
+      <param name="minLogLevel" value="Debug" />
     </loggingProvider>
     <cachingProvider type="DotNetToolkit.Repository.Caching.InMemory.InMemoryCacheProvider, DotNetToolkit.Repository.Caching.InMemory">
-      <parameters>
-        <parameter name="expiry" value="00:00:30" />
-      </parameters>
+      <param name="expiry" value="00:00:30" />
     </cachingProvider>
     <interceptors>
       <interceptor type="DotNetToolkit.Repository.Test.Data.TestRepositoryInterceptor, DotNetToolkit.Repository.Test">
-        <parameters>
-          <parameter name="p1" value="random param" />
-          <parameter name="p2" value="True" />
-        </parameters>
+        <param name="p1" value="random param" />
+        <param name="p2" value="True" />
       </interceptor>
     </interceptors>
   </repository>
diff --git a/test/DotNetToolkit.Repository.Test/repository.config b/test/DotNetToolkit.Repository.Test/repository.config
@@ -6,27 +6,19 @@
   </configSections>
   <repository>
     <defaultContextFactory type="DotNetToolkit.Repository.InMemory.Internal.InMemoryRepositoryContextFactory, DotNetToolkit.Repository.InMemory">
-      <parameters>
-        <parameter name="ignoreTransactionWarning" value="True" />
-        <parameter name="databaseName" value="__InMemoryDatabaseName__" />
-      </parameters>
+      <param name="ignoreTransactionWarning" value="True" />
+      <param name="databaseName" value="__InMemoryDatabaseName__" />
     </defaultContextFactory>
     <loggingProvider type="DotNetToolkit.Repository.Configuration.Logging.ConsoleLoggerProvider, DotNetToolkit.Repository">
-      <parameters>
-        <parameter name="minLogLevel" value="Debug" />
-      </parameters>
+      <param name="minLogLevel" value="Debug" />
     </loggingProvider>
     <cachingProvider type="DotNetToolkit.Repository.Caching.InMemory.InMemoryCacheProvider, DotNetToolkit.Repository.Caching.InMemory">
-      <parameters>
-        <parameter name="expiry" value="00:00:30" />
-      </parameters>
+      <param name="expiry" value="00:00:30" />
     </cachingProvider>
     <interceptors>
       <interceptor type="DotNetToolkit.Repository.Test.Data.TestRepositoryInterceptor, DotNetToolkit.Repository.Test">
-        <parameters>
-          <parameter name="p1" value="random param" />
-          <parameter name="p2" value="True" />
-        </parameters>
+        <param name="p1" value="random param" />
+        <param name="p2" value="True" />
       </interceptor>
     </interceptors>
   </repository>

Original file line number	Diff line number	Diff line change
`@@ -37,19 +37,19 @@ public virtual RepositoryInterceptorElementCollection Interceptors`
`37`	`37`	`get => (RepositoryInterceptorElementCollection)this[InterceptorsKey];`
`38`	`38`	`}`
`39`	`39`
`40`		`- [ConfigurationProperty(DefaultContextFactoryKey, IsRequired = false)]`
	`40`	`+ [ConfigurationProperty(DefaultContextFactoryKey, IsRequired = false, IsDefaultCollection = false)]`
`41`	`41`	`public virtual RepositoryContextFactoryElement DefaultContextFactory`
`42`	`42`	`{`
`43`	`43`	`get => (RepositoryContextFactoryElement)this[DefaultContextFactoryKey];`
`44`	`44`	`}`
`45`	`45`
`46`		`- [ConfigurationProperty(LoggingProviderKey, IsRequired = false)]`
	`46`	`+ [ConfigurationProperty(LoggingProviderKey, IsRequired = false, IsDefaultCollection = false)]`
`47`	`47`	`public virtual LoggingProviderElement LoggingProvider`
`48`	`48`	`{`
`49`	`49`	`get => (LoggingProviderElement)this[LoggingProviderKey];`
`50`	`50`	`}`
`51`	`51`
`52`		`- [ConfigurationProperty(CachingProviderKey, IsRequired = false)]`
	`52`	`+ [ConfigurationProperty(CachingProviderKey, IsRequired = false, IsDefaultCollection = false)]`
`53`	`53`	`public virtual CachingProviderElement CachingProvider`
`54`	`54`	`{`
`55`	`55`	`get => (CachingProviderElement)this[CachingProviderKey];`
`@@ -145,7 +145,7 @@ public string ValueString`
`145`	`145`
`146`	`146`	`class ParameterCollection : ConfigurationElementCollection`
`147`	`147`	`{`
`148`		`- private const string ParameterKey = "parameter";`
	`148`	`+ private const string ParameterKey = "param";`
`149`	`149`
`150`	`150`	`public override ConfigurationElementCollectionType CollectionType`
`151`	`151`	`{`
`@@ -168,10 +168,9 @@ protected override string ElementName`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`171`		`- abstract class TypedConfigurationElementBase<T> : ConfigurationElement`
	`171`	`+ abstract class TypedConfigurationElementBase<T> : ParameterCollection`
`172`	`172`	`{`
`173`	`173`	`private const string TypeKey = "type";`
`174`		`- private const string ParametersKey = "parameters";`
`175`	`174`
`176`	`175`	`private Type _type;`
`177`	`176`
`@@ -203,21 +202,14 @@ public Type Type`
`203`	`202`	`}`
`204`	`203`	`}`
`205`	`204`
`206`		`- [ConfigurationProperty(ParametersKey, IsDefaultCollection = false)]`
`207`		`- public ParameterCollection Parameters`
`208`		`- {`
`209`		`- get { return (ParameterCollection)this[ParametersKey]; }`
`210`		`- }`
`211`		`-`
`212`	`205`	`public virtual T GetTypedValue()`
`213`	`206`	`{`
`214`	`207`	`var type = Type;`
`215`	`208`
`216`	`209`	`if (type == null)`
`217`	`210`	`return default(T);`
`218`	`211`
`219`		`- var keyValues = Parameters`
`220`		`- .Cast<ParameterElement>()`
	`212`	`+ var keyValues = this.Cast<ParameterElement>()`
`221`	`213`	`.ToDictionary(x => x.Name, x => x.ValueString);`
`222`	`214`
`223`	`215`	`if (!keyValues.Any())`