Merge pull request #8 from off-sync/develop

basverweij · web-flow · commit ff44a713cf37 · 2019-06-16T22:27:44.000+02:00
v1.1.0
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Version">
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
   </PropertyGroup>
 
diff --git a/src/OffSync.Mapping.Mappert.DynamicMethods/DynamicMethodMappingDelegateBuilder.cs b/src/OffSync.Mapping.Mappert.DynamicMethods/DynamicMethodMappingDelegateBuilder.cs
@@ -8,21 +8,20 @@
 using System.Linq;
 using System.Reflection.Emit;
 
-using OffSync.Mapping.Mappert.DynamicMethods;
 using OffSync.Mapping.Mappert.DynamicMethods.Common;
 using OffSync.Mapping.Mappert.Practises;
-using OffSync.Mapping.Mappert.Practises.Configuration;
 using OffSync.Mapping.Mappert.Practises.MappingRules;
 
-[assembly: RegisterMappingDelegateBuilder(
-    typeof(DynamicMethodMappingDelegateBuilder),
-    Preference = 100)]
-
 namespace OffSync.Mapping.Mappert.DynamicMethods
 {
     public class DynamicMethodMappingDelegateBuilder :
         IMappingDelegateBuilder
     {
+        public static void SetAsDefault()
+        {
+            MappingDelegateBuilderRegistry.Default = new DynamicMethodMappingDelegateBuilder();
+        }
+
         public MappingDelegate<TSource, TTarget> CreateMappingDelegate<TSource, TTarget>(
             IEnumerable<IMappingRule> mappingRules)
         {
diff --git a/src/OffSync.Mapping.Mappert.Practises/Common/ConfigurationUtil.cs b/src/OffSync.Mapping.Mappert.Practises/Common/ConfigurationUtil.cs
diff --git a/src/OffSync.Mapping.Mappert.Practises/Common/Messages.Designer.cs b/src/OffSync.Mapping.Mappert.Practises/Common/Messages.Designer.cs
diff --git a/src/OffSync.Mapping.Mappert.Practises/Common/Messages.resx b/src/OffSync.Mapping.Mappert.Practises/Common/Messages.resx
@@ -116,13 +116,6 @@
     <value>invalid builder return type '{0}', must implement matching ValueTuple or object[]</value>
     <comment>Placeholder: return type name.</comment>
   </data>
-  <data name="InvalidTypeMustBeAssignableToIMappingDelegateBuilder" xml:space="preserve">
-    <value>invalid type '{0}': must be assignable to IMappingDelegateBuilder</value>
-    <comment>Placeholder: type name.</comment>
-  </data>
-  <data name="NoMappingDelegateRegistered" xml:space="preserve">
-    <value>no mapping delegate registered</value>
-  </data>
   <data name="MessageMustBeProvided" xml:space="preserve">
     <value>message must be provided</value>
   </data>
diff --git a/src/OffSync.Mapping.Mappert.Practises/Configuration/RegisterMappingDelegateBuilderAttribute.cs b/src/OffSync.Mapping.Mappert.Practises/Configuration/RegisterMappingDelegateBuilderAttribute.cs
diff --git a/src/OffSync.Mapping.Mappert.Practises/MappingDelegateBuilderRegistry.cs b/src/OffSync.Mapping.Mappert.Practises/MappingDelegateBuilderRegistry.cs
@@ -0,0 +1,7 @@
+﻿namespace OffSync.Mapping.Mappert.Practises
+{
+    public static class MappingDelegateBuilderRegistry
+    {
+        public static IMappingDelegateBuilder Default { get; set; }
+    }
+}
diff --git a/src/OffSync.Mapping.Mappert.Reflection/ReflectionMappingDelegateBuilder.cs b/src/OffSync.Mapping.Mappert.Reflection/ReflectionMappingDelegateBuilder.cs
@@ -8,18 +8,19 @@
 using System.Linq;
 
 using OffSync.Mapping.Mappert.Practises;
-using OffSync.Mapping.Mappert.Practises.Configuration;
 using OffSync.Mapping.Mappert.Practises.MappingRules;
-using OffSync.Mapping.Mappert.Reflection;
 using OffSync.Mapping.Mappert.Reflection.MappingSteps;
 
-[assembly: RegisterMappingDelegateBuilder(typeof(ReflectionMappingDelegateBuilder))]
-
 namespace OffSync.Mapping.Mappert.Reflection
 {
     public sealed class ReflectionMappingDelegateBuilder :
         IMappingDelegateBuilder
     {
+        public static void SetAsDefault()
+        {
+            MappingDelegateBuilderRegistry.Default = new ReflectionMappingDelegateBuilder();
+        }
+
         public MappingDelegate<TSource, TTarget> CreateMappingDelegate<TSource, TTarget>(
             IEnumerable<IMappingRule> mappingRules)
         {
diff --git a/src/OffSync.Mapping.Mappert/MapperBuilders/MapperBuilder.cs b/src/OffSync.Mapping.Mappert/MapperBuilders/MapperBuilder.cs
@@ -9,8 +9,8 @@
 using OffSync.Mapping.Mappert.Common;
 using OffSync.Mapping.Mappert.MappingRules;
 using OffSync.Mapping.Mappert.Practises;
-using OffSync.Mapping.Mappert.Practises.Common;
 using OffSync.Mapping.Mappert.Practises.MappingRules;
+using OffSync.Mapping.Mappert.Reflection;
 
 namespace OffSync.Mapping.Mappert.MapperBuilders
 {
@@ -89,7 +89,12 @@ protected virtual MappingDelegate<TSource, TTarget> CreateMappingDelegate(
         {
             if (_mappingDelegateBuilder == null)
             {
-                _mappingDelegateBuilder = ConfigurationUtil.GetRegisteredMappingDelegateBuilder();
+                if (MappingDelegateBuilderRegistry.Default == null)
+                {
+                    MappingDelegateBuilderRegistry.Default = new ReflectionMappingDelegateBuilder();
+                }
+
+                _mappingDelegateBuilder = MappingDelegateBuilderRegistry.Default;
             }
 
             return _mappingDelegateBuilder.CreateMappingDelegate<TSource, TTarget>(mappingRules);
diff --git a/test/OffSync.Mapping.Mappert.DynamicMethods.Tests/DynamicMethodMappingDelegateBuilderTest.cs b/test/OffSync.Mapping.Mappert.DynamicMethods.Tests/DynamicMethodMappingDelegateBuilderTest.cs
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 
 using OffSync.Mapping.Mappert.MappingRules;
-using OffSync.Mapping.Mappert.Practises.Common;
+using OffSync.Mapping.Mappert.Practises;
 using OffSync.Mapping.Mappert.Practises.MappingRules;
 using OffSync.Mapping.Mappert.Tests.Models;
 
@@ -22,13 +22,15 @@ public class DynamicMethodMappingDelegateBuilderTest
         [SetUp]
         public void SetUp()
         {
+            DynamicMethodMappingDelegateBuilder.SetAsDefault();
+
             _sut = new DynamicMethodMappingDelegateBuilder();
         }
 
         [Test]
         public void IsRegistered()
         {
-            var builder = ConfigurationUtil.GetRegisteredMappingDelegateBuilder();
+            var builder = MappingDelegateBuilderRegistry.Default;
 
             Assert.That(
                 builder,
diff --git a/test/OffSync.Mapping.Mappert.Practises.Tests/Common/ConfigurationUtilTest.cs b/test/OffSync.Mapping.Mappert.Practises.Tests/Common/ConfigurationUtilTest.cs
diff --git a/test/OffSync.Mapping.Mappert.Reflection.Tests/ReflectionMappingDelegateBuilderTest.cs b/test/OffSync.Mapping.Mappert.Reflection.Tests/ReflectionMappingDelegateBuilderTest.cs
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 
 using OffSync.Mapping.Mappert.MappingRules;
-using OffSync.Mapping.Mappert.Practises.Common;
+using OffSync.Mapping.Mappert.Practises;
 using OffSync.Mapping.Mappert.Practises.MappingRules;
 using OffSync.Mapping.Mappert.Tests.Models;
 
@@ -22,13 +22,15 @@ public class ReflectionMappingDelegateBuilderTest
         [SetUp]
         public void SetUp()
         {
+            ReflectionMappingDelegateBuilder.SetAsDefault();
+
             _sut = new ReflectionMappingDelegateBuilder();
         }
 
         [Test]
         public void IsRegistered()
         {
-            var builder = ConfigurationUtil.GetRegisteredMappingDelegateBuilder();
+            var builder = MappingDelegateBuilderRegistry.Default;
 
             Assert.That(
                 builder,
diff --git a/test/code-analysis.ps1 b/test/code-analysis.ps1
@@ -6,9 +6,9 @@ $testProjects =
 	'OffSync.Mapping.Mappert.Benchmarks.Tests'
 
 $frameworks = 
-    'netcoreapp2.2'#, 
-#    'net461', 
-#    'net472'
+    'netcoreapp2.2', 
+    'net461', 
+    'net472'
 
 foreach ($framework in $frameworks)
 {
@@ -22,9 +22,6 @@ foreach ($framework in $frameworks)
     }
 
 	reportgenerator "-reports:out\$($framework)\*.xml" "-targetdir:out\$($framework)\coveragereport"
-}
 
-foreach ($framework in $frameworks)
-{
 	ii out\$framework\coveragereport\index.htm
 }

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`9`	`9`	`using OffSync.Mapping.Mappert.Common;`
`10`	`10`	`using OffSync.Mapping.Mappert.MappingRules;`
`11`	`11`	`using OffSync.Mapping.Mappert.Practises;`
`12`		`-using OffSync.Mapping.Mappert.Practises.Common;`
`13`	`12`	`using OffSync.Mapping.Mappert.Practises.MappingRules;`
	`13`	`+using OffSync.Mapping.Mappert.Reflection;`
`14`	`14`
`15`	`15`	`namespace OffSync.Mapping.Mappert.MapperBuilders`
`16`	`16`	`{`
`@@ -89,7 +89,12 @@ protected virtual MappingDelegate<TSource, TTarget> CreateMappingDelegate(`
`89`	`89`	`{`
`90`	`90`	`if (_mappingDelegateBuilder == null)`
`91`	`91`	`{`
`92`		`- _mappingDelegateBuilder = ConfigurationUtil.GetRegisteredMappingDelegateBuilder();`
	`92`	`+ if (MappingDelegateBuilderRegistry.Default == null)`
	`93`	`+ {`
	`94`	`+ MappingDelegateBuilderRegistry.Default = new ReflectionMappingDelegateBuilder();`
	`95`	`+ }`
	`96`	`+`
	`97`	`+ _mappingDelegateBuilder = MappingDelegateBuilderRegistry.Default;`
`93`	`98`	`}`
`94`	`99`
`95`	`100`	`return _mappingDelegateBuilder.CreateMappingDelegate<TSource, TTarget>(mappingRules);`