Patch for Issues 832 & 833

akkadotnet · Apr 11, 2015 · 4f523b1 · 4f523b1
1 parent d523916
commit 4f523b1
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 30 deletions.
diff --git a/src/contrib/dependencyInjection/Akka.DI.AutoFac/AutoFacDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.AutoFac/AutoFacDependencyResolver.cs
@@ -73,11 +73,10 @@ public Type GetType(string actorName)
         /// </summary>
         /// <param name="actorName">Name of the ActorType</param>
         /// <returns>factory delegate</returns>
-        public Func<ActorBase> CreateActorFactory(string actorName)
+        public Func<ActorBase> CreateActorFactory(Type actorType)
         {
             return () =>
             {
-                Type actorType = this.GetType(actorName);
                 var scope = container.BeginLifetimeScope();
                 var actor = (ActorBase)scope.Resolve(actorType);
                 references.Add(actor, scope);
@@ -91,7 +90,7 @@ public Func<ActorBase> CreateActorFactory(string actorName)
         /// <returns>Props configuration instance</returns>
         public Props Create<TActor>() where TActor : ActorBase
         {
-            return system.GetExtension<DIExt>().Props(typeof(TActor).Name);
+            return system.GetExtension<DIExt>().Props(typeof(TActor));
         }
 
         /// <summary>

diff --git a/src/contrib/dependencyInjection/Akka.DI.CastleWindsor/WindsorDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.CastleWindsor/WindsorDependencyResolver.cs
@@ -64,9 +64,9 @@ public Type GetType(string actorName)
         /// </summary>
         /// <param name="actorName">Name of the ActorType</param>
         /// <returns>factory delegate</returns>
-        public Func<ActorBase> CreateActorFactory(string actorName)
+        public Func<ActorBase> CreateActorFactory(Type actorType)
         {
-            return () => (ActorBase)container.Resolve(GetType(actorName));
+            return () => (ActorBase)container.Resolve(actorType);
         }
         /// <summary>
         /// Used Register the Configuration for the ActorType specified in TActor
@@ -75,7 +75,7 @@ public Func<ActorBase> CreateActorFactory(string actorName)
         /// <returns>Props configuration instance</returns>
         public Props Create<TActor>() where TActor : ActorBase
         {
-            return system.GetExtension<DIExt>().Props(typeof(TActor).Name);
+            return system.GetExtension<DIExt>().Props(typeof(TActor));
         }
 
         /// <summary>

diff --git a/src/contrib/dependencyInjection/Akka.DI.Core/DIActorContextAdapter.cs b/src/contrib/dependencyInjection/Akka.DI.Core/DIActorContextAdapter.cs
@@ -24,9 +24,9 @@ public DIActorContextAdapter(IActorContext context)
             this.context = context;
             this.producer = context.System.GetExtension<DIExt>();
         }
-        public IActorRef ActorOf<TActor>(string name = null) where TActor : ActorBase, new()
+        public IActorRef ActorOf<TActor>(string name = null) where TActor : ActorBase
         {
-            return context.ActorOf(producer.Props(typeof(TActor).Name), name);
+            return context.ActorOf(producer.Props(typeof(TActor)), name);
         }
     }
 }

diff --git a/src/contrib/dependencyInjection/Akka.DI.Core/DIActorProducer.cs b/src/contrib/dependencyInjection/Akka.DI.Core/DIActorProducer.cs
@@ -16,25 +16,26 @@ namespace Akka.DI.Core
     public class DIActorProducer : IIndirectActorProducer
     {
         private IDependencyResolver dependencyResolver;
-        private string actorName;
+        private Type actorType;
+
         readonly Func<ActorBase> actorFactory;
 
         public DIActorProducer(IDependencyResolver dependencyResolver,
-                               string actorName)
+                               Type actorType)
         {
             if (dependencyResolver == null) throw new ArgumentNullException("dependencyResolver");
-            if (actorName == null) throw new ArgumentNullException("actorName");
+            if (actorType == null) throw new ArgumentNullException("actorType");
 
             this.dependencyResolver = dependencyResolver;
-            this.actorName = actorName;
-            this.actorFactory = dependencyResolver.CreateActorFactory(actorName);
+            this.actorType = actorType;
+            this.actorFactory = dependencyResolver.CreateActorFactory(actorType);
         }
         /// <summary>
         /// The System.Type of the Actor specified in the constructor parameter actorName
         /// </summary>
         public Type ActorType
         {
-            get { return this.dependencyResolver.GetType(this.actorName); }
+            get { return this.dependencyResolver.GetType(); }
         }
         /// <summary>
         /// Creates an instance of the Actor based on the Type specified in the constructor parameter actorName

diff --git a/src/contrib/dependencyInjection/Akka.DI.Core/DIExt.cs b/src/contrib/dependencyInjection/Akka.DI.Core/DIExt.cs
@@ -26,9 +26,9 @@ public void Initialize(IDependencyResolver dependencyResolver)
             if (dependencyResolver == null) throw new ArgumentNullException("dependencyResolver");
             this.dependencyResolver = dependencyResolver;
         }
-        public Props Props(String actorName)
+        public Props Props(Type actorType)
         {
-            return new Props(typeof(DIActorProducer), new object[] { dependencyResolver, actorName });
+            return new Props(typeof(DIActorProducer), new object[] { dependencyResolver, actorType });
         }
 
     }

diff --git a/src/contrib/dependencyInjection/Akka.DI.Core/IDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.Core/IDependencyResolver.cs
@@ -21,13 +21,13 @@ public interface IDependencyResolver
         /// </summary>
         /// <param name="actorName"></param>
         /// <returns>Type of the Actor specified in the actorName</returns>
-        Type GetType(string actorName);
+        Type GetType();
         /// <summary>
         /// Creates a delegate factory based on the actorName
         /// </summary>
         /// <param name="actorName">Name of the ActorType</param>
         /// <returns>factory delegate</returns>
-        Func<ActorBase> CreateActorFactory(string actorName);
+        Func<ActorBase> CreateActorFactory(Type actorType);
         /// <summary>
         /// Used Register the Configuration for the ActorType specified in TActor
         /// </summary>

diff --git a/src/contrib/dependencyInjection/Akka.DI.Ninject/NinjectDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.Ninject/NinjectDependencyResolver.cs
@@ -56,12 +56,10 @@ public Type GetType(string actorName)
         /// </summary>
         /// <param name="actorName">Name of the ActorType</param>
         /// <returns>factory delegate</returns>
-        public Func<ActorBase> CreateActorFactory(string actorName)
+        public Func<ActorBase> CreateActorFactory(Type actorType)
         {
             return () =>
             {
-                Type actorType = this.GetType(actorName);
-
                 return (ActorBase)container.GetService(actorType);
             };
         }
@@ -72,7 +70,7 @@ public Func<ActorBase> CreateActorFactory(string actorName)
         /// <returns>Props configuration instance</returns>
         public Props Create<TActor>() where TActor : ActorBase
         {
-            return system.GetExtension<DIExt>().Props(typeof(TActor).Name);
+            return system.GetExtension<DIExt>().Props(typeof(TActor));
         }
 
         /// <summary>

diff --git a/src/contrib/dependencyInjection/Akka.DI.Unity/UnityDependencyResolver.cs b/src/contrib/dependencyInjection/Akka.DI.Unity/UnityDependencyResolver.cs
@@ -40,18 +40,17 @@ public Type GetType(string actorName)
             return typeCache[actorName];
 	    }
 
-	    public Func<ActorBase> CreateActorFactory(string actorName)
+        public Func<ActorBase> CreateActorFactory(Type actorType)
 	    {
 			return () =>
 			{
-				var actorType = GetType(actorName);
 				return (ActorBase)container.Resolve(actorType);
 			};
 	    }
 
 	    public Props Create<TActor>() where TActor : ActorBase
 	    {
-		    return system.GetExtension<DIExt>().Props(typeof(TActor).Name);
+		    return system.GetExtension<DIExt>().Props(typeof(TActor));
 	    }
 
 	    public void Release(ActorBase actor)

diff --git a/src/contrib/dependencyInjection/Examples/BasicAutoFacUses/Actors.cs b/src/contrib/dependencyInjection/Examples/BasicAutoFacUses/Actors.cs
@@ -69,7 +69,7 @@ public void Handle(TypedActorMessage message)
     {
         Console.WriteLine("TypedParentWorker - {0} received {1}", Self.Path.Name, message);
         var producer = Context.System.GetExtension<DIExt>();
-        Context.ActorOf(producer.Props("TypedWorker")).Tell(message);
+        Context.DI().ActorOf<TypedActor>().Tell(message);
     }
 
 

diff --git a/src/contrib/dependencyInjection/Examples/BasicAutoFacUses/Program.cs b/src/contrib/dependencyInjection/Examples/BasicAutoFacUses/Program.cs
@@ -54,10 +54,13 @@ private static void WithHashPool()
 
                     }
                 }
+                Console.WriteLine("Hit Enter to close");
+                Console.ReadLine();
             }
 
-            Console.ReadLine();
+
         }
+
     }
 }
 
diff --git a/src/contrib/dependencyInjection/Examples/BasicCastleWindsorUse/Program.cs b/src/contrib/dependencyInjection/Examples/BasicCastleWindsorUse/Program.cs
@@ -52,9 +52,11 @@ private static void WithHashPool()
 
                     }
                 }
+                Console.WriteLine("Hit Enter to exit");
+                Console.ReadLine();
             }
 
-            Console.ReadLine();
+
         }
     }
 }

diff --git a/src/contrib/dependencyInjection/Examples/BasicNinjectUses/Program.cs b/src/contrib/dependencyInjection/Examples/BasicNinjectUses/Program.cs
@@ -51,10 +51,11 @@ private static void WithHashPool()
 
                     }
                 }
+                Console.WriteLine("Hit Enter to exit");
+                Console.ReadLine();
             }
 
 
-            Console.ReadLine();
         }
     }
 }

diff --git a/src/contrib/dependencyInjection/Examples/BasicUnityUses/Program.cs b/src/contrib/dependencyInjection/Examples/BasicUnityUses/Program.cs
@@ -55,10 +55,11 @@ private static void WithHashPool()
 
                     }
                 }
+                Console.WriteLine("Hit Enter to exit");
+                Console.ReadLine();
             }
 
 
-            Console.ReadLine();
         }
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,9 +52,11 @@ private static void WithHashPool() @@
                         }
                     }
+                    Console.WriteLine("Hit Enter to exit");
+                    Console.ReadLine();
                 }
-                Console.ReadLine();
             }
         }
     }
@@ Expand Down @@