Merge pull request #858 from sean-gilliam/dry-di-extension

Refactored common extension
akkadotnet · Apr 16, 2015 · cd8008f · cd8008f
2 parents f488215 + abfda59
commit cd8008f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 81 deletions.
diff --git a/src/contrib/dependencyInjection/Akka.DI.AutoFac/AutoFacDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.AutoFac/AutoFacDependencyResolver.cs
@@ -110,24 +110,4 @@ public void Release(ActorBase actor)
             }
         }
     }
-    internal static class Extensions
-    {
-        public static Type GetTypeValue(this string typeName)
-        {
-            var firstTry = Type.GetType(typeName);
-            Func<Type> searchForType = () =>
-            {
-                return
-                AppDomain.
-                    CurrentDomain.
-                    GetAssemblies().
-                    SelectMany(x => x.GetTypes()).
-                    Where(t => t.Name.Equals(typeName)).
-                    FirstOrDefault();
-            };
-            return firstTry ?? searchForType();
-        }
-
-    }
 }
-
diff --git a/src/contrib/dependencyInjection/Akka.DI.CastleWindsor/WindsorDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.CastleWindsor/WindsorDependencyResolver.cs
@@ -88,26 +88,5 @@ public void Release(ActorBase actor)
         {
             this.container.Release(actor);
         }
-
-    }
-    internal static class Extensions
-    {
-        public static Type GetTypeValue(this string typeName)
-        {
-            var firstTry = Type.GetType(typeName);
-            Func<Type> searchForType = () =>
-            {
-                return
-                AppDomain.
-                    CurrentDomain.
-                    GetAssemblies().
-                    SelectMany(x => x.GetTypes()).
-                    Where(t => t.Name.Equals(typeName)).
-                    FirstOrDefault();
-            };
-            return firstTry ?? searchForType();
-        }
-
     }
 }
-
diff --git a/src/contrib/dependencyInjection/Akka.DI.Core/Extensions.cs b/src/contrib/dependencyInjection/Akka.DI.Core/Extensions.cs
@@ -6,6 +6,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.Linq;
 using Akka.Actor;
 
 namespace Akka.DI.Core
@@ -34,6 +35,17 @@ public static DIActorContextAdapter DI(this IActorContext context)
             return new DIActorContextAdapter(context);
         }
 
+        public static Type GetTypeValue(this string typeName)
+        {
+            var firstTry = Type.GetType(typeName);
+            Func<Type> searchForType = () =>
+                AppDomain.CurrentDomain
+                    .GetAssemblies()
+                    .SelectMany(x => x.GetTypes())
+                    .FirstOrDefault(t => t.Name.Equals(typeName));
+
+            return firstTry ?? searchForType();
+        }
     }
 }
 
diff --git a/src/contrib/dependencyInjection/Akka.DI.Ninject/NinjectDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.Ninject/NinjectDependencyResolver.cs
@@ -83,24 +83,4 @@ public void Release(ActorBase actor)
             container.Release(actor);
         }
     }
-    internal static class Extensions
-    {
-        public static Type GetTypeValue(this string typeName)
-        {
-            var firstTry = Type.GetType(typeName);
-            Func<Type> searchForType = () =>
-            {
-                return
-                AppDomain.
-                    CurrentDomain.
-                    GetAssemblies().
-                    SelectMany(x => x.GetTypes()).
-                    Where(t => t.Name.Equals(typeName)).
-                    FirstOrDefault();
-            };
-            return firstTry ?? searchForType();
-        }
-
-    }
 }
-
diff --git a/src/contrib/dependencyInjection/Akka.DI.Unity/UnityDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.Unity/UnityDependencyResolver.cs
@@ -58,24 +58,4 @@ public void Release(ActorBase actor)
 		    container.Teardown(actor);
 	    }
     }
-
-	internal static class Extensions
-    {
-        public static Type GetTypeValue(this string typeName)
-        {
-            var firstTry = Type.GetType(typeName);
-            Func<Type> searchForType = () =>
-            {
-                return
-                AppDomain.
-                    CurrentDomain.
-                    GetAssemblies().
-                    SelectMany(x => x.GetTypes()).
-                    Where(t => t.Name.Equals(typeName)).
-                    FirstOrDefault();
-            };
-            return firstTry ?? searchForType();
-        }
-    }
 }
-