Corrected bug on instantiation with configuration, StructureMapDependencyResolution class renamed to StructureMapRepositoryDependencyResolution

pianiomar · pianiomar · commit 5b2b2c6c9c15 · 2016-01-14T11:26:29.000+01:00
diff --git a/SharpRepository.Ioc.StructureMap/Factories/CompoundKey.cs b/SharpRepository.Ioc.StructureMap/Factories/CompoundKey.cs
@@ -44,8 +44,9 @@ public override Instance CloseType(Type[] types)
         {
             var instanceType = typeof(RepositoryCompoundKeyInstance<>).MakeGenericType(types);
             
-            if (this.configuration != null) { 
-                return Activator.CreateInstance(instanceType,this.configuration, this.repositoryName) as Instance;
+            if (this.configuration != null) {
+                var ctor = instanceType.GetConstructor(new[] { typeof(ISharpRepositoryConfiguration) });
+                return ctor.Invoke(new object[] { this.configuration }) as Instance;
             } else {
                 var ctor = instanceType.GetConstructor(new[] { typeof(string) });
                 return ctor.Invoke(new object[] { this.repositoryName }) as Instance;
diff --git a/SharpRepository.Ioc.StructureMap/Factories/DoubleKey.cs b/SharpRepository.Ioc.StructureMap/Factories/DoubleKey.cs
@@ -44,8 +44,9 @@ public override Instance CloseType(Type[] types)
         {
             var instanceType = typeof(RepositoryInstance<,,>).MakeGenericType(types);
             
-            if (this.configuration != null) { 
-                return Activator.CreateInstance(instanceType,this.configuration, this.repositoryName) as Instance;
+            if (this.configuration != null) {
+                var ctor = instanceType.GetConstructor(new[] { typeof(ISharpRepositoryConfiguration) });
+                return ctor.Invoke(new object[] { this.configuration }) as Instance;
             } else {
                 var ctor = instanceType.GetConstructor(new[] { typeof(string) });
                 return ctor.Invoke(new object[] { this.repositoryName }) as Instance;
diff --git a/SharpRepository.Ioc.StructureMap/Factories/NoKey.cs b/SharpRepository.Ioc.StructureMap/Factories/NoKey.cs
@@ -44,8 +44,9 @@ public override Instance CloseType(Type[] types)
         {
             var instanceType = typeof(RepositoryInstance<>).MakeGenericType(types);
             
-            if (this.configuration != null) { 
-                return Activator.CreateInstance(instanceType,this.configuration, this.repositoryName) as Instance;
+            if (this.configuration != null) {
+                var ctor = instanceType.GetConstructor(new[] { typeof(ISharpRepositoryConfiguration), typeof(string) });
+                return ctor.Invoke(new object[] { this.configuration }) as Instance;
             } else {
                 var ctor = instanceType.GetConstructor(new[] { typeof(string) });
                 return ctor.Invoke(new object[] { this.repositoryName }) as Instance;
diff --git a/SharpRepository.Ioc.StructureMap/Factories/SingleKey.cs b/SharpRepository.Ioc.StructureMap/Factories/SingleKey.cs
@@ -48,7 +48,8 @@ public override Instance CloseType(Type[] types)
 
             if (this.configuration != null)
             {
-                return Activator.CreateInstance(instanceType, this.configuration, this.repositoryName) as Instance;
+                var ctor = instanceType.GetConstructor(new[] { typeof(ISharpRepositoryConfiguration) });
+                return ctor.Invoke(new object[] { this.configuration }) as Instance;
             }
             else {
                 var ctor = instanceType.GetConstructor(new[] { typeof(string) });
diff --git a/SharpRepository.Ioc.StructureMap/Factories/TripleKey.cs b/SharpRepository.Ioc.StructureMap/Factories/TripleKey.cs
@@ -44,8 +44,9 @@ public override Instance CloseType(Type[] types)
         {
             var instanceType = typeof(RepositoryInstance<,,,>).MakeGenericType(types);
             
-            if (this.configuration != null) { 
-                return Activator.CreateInstance(instanceType,this.configuration, this.repositoryName) as Instance;
+            if (this.configuration != null) {
+                var ctor = instanceType.GetConstructor(new[] { typeof(ISharpRepositoryConfiguration) });
+                return ctor.Invoke(new object[] { this.configuration }) as Instance;
             } else {
                 var ctor = instanceType.GetConstructor(new[] { typeof(string) });
                 return ctor.Invoke(new object[] { this.repositoryName }) as Instance;
diff --git a/SharpRepository.Ioc.StructureMap/SharpRepository.Ioc.StructureMap.csproj b/SharpRepository.Ioc.StructureMap/SharpRepository.Ioc.StructureMap.csproj
@@ -53,8 +53,8 @@
     <Compile Include="Factories\SingleKey.cs" />
     <Compile Include="Factories\NoKey.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StructureMapDependencyResolver.cs" />
     <Compile Include="StructureMapExtensions.cs" />
+    <Compile Include="StructureMapRepositoryDependencyResolver.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SharpRepository.Repository\SharpRepository.Repository.csproj">
diff --git a/SharpRepository.Ioc.StructureMap/StructureMapRepositoryDependencyResolver.cs b/SharpRepository.Ioc.StructureMap/StructureMapRepositoryDependencyResolver.cs
@@ -4,10 +4,10 @@
 
 namespace SharpRepository.Ioc.StructureMap
 {
-    public class StructureMapDependencyResolver : BaseRepositoryDependencyResolver
+    public class StructureMapRepositoryDependencyResolver : BaseRepositoryDependencyResolver
     {
         private readonly IContainer _container;
-        public StructureMapDependencyResolver(IContainer container)
+        public StructureMapRepositoryDependencyResolver(IContainer container)
         {
             _container = container;
         }
diff --git a/SharpRepository.Tests.Integration/Spikes/RepositoryDependencySpikes.cs b/SharpRepository.Tests.Integration/Spikes/RepositoryDependencySpikes.cs
@@ -34,7 +34,7 @@ public void Setup()
                 x.ForRepositoriesUseSharpRepository();
             });
 
-            RepositoryDependencyResolver.SetDependencyResolver(new StructureMapDependencyResolver(container));
+            RepositoryDependencyResolver.SetDependencyResolver(new StructureMapRepositoryDependencyResolver(container));
         }
 
         [Test]

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ public override Instance CloseType(Type[] types)`
`48`	`48`
`49`	`49`	`if (this.configuration != null)`
`50`	`50`	`{`
`51`		`- return Activator.CreateInstance(instanceType, this.configuration, this.repositoryName) as Instance;`
	`51`	`+ var ctor = instanceType.GetConstructor(new[] { typeof(ISharpRepositoryConfiguration) });`
	`52`	`+ return ctor.Invoke(new object[] { this.configuration }) as Instance;`
`52`	`53`	`}`
`53`	`54`	`else {`
`54`	`55`	`var ctor = instanceType.GetConstructor(new[] { typeof(string) });`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace SharpRepository.Ioc.StructureMap`
`6`	`6`	`{`
`7`		`- public class StructureMapDependencyResolver : BaseRepositoryDependencyResolver`
	`7`	`+ public class StructureMapRepositoryDependencyResolver : BaseRepositoryDependencyResolver`
`8`	`8`	`{`
`9`	`9`	`private readonly IContainer _container;`
`10`		`- public StructureMapDependencyResolver(IContainer container)`
	`10`	`+ public StructureMapRepositoryDependencyResolver(IContainer container)`
`11`	`11`	`{`
`12`	`12`	`_container = container;`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void Setup()`
`34`	`34`	`x.ForRepositoriesUseSharpRepository();`
`35`	`35`	`});`
`36`	`36`
`37`		`- RepositoryDependencyResolver.SetDependencyResolver(new StructureMapDependencyResolver(container));`
	`37`	`+ RepositoryDependencyResolver.SetDependencyResolver(new StructureMapRepositoryDependencyResolver(container));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`[Test]`