Merge pull request #375 from Cysharp/hotfix/GroupConfigurationAttribute

Use ActivatorUtilities with the service provider instead of Activator
Cysharp · Nov 18, 2020 · 28553e4 · 28553e4
2 parents c414891 + 5d718b0
commit 28553e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/MagicOnion.Server/Hubs/Group.cs b/src/MagicOnion.Server/Hubs/Group.cs
@@ -10,16 +10,16 @@ namespace MagicOnion.Server.Hubs
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
     public class GroupConfigurationAttribute : Attribute
     {
-        Type type;
+        public Type FactoryType { get; }
 
         public GroupConfigurationAttribute(Type groupRepositoryFactoryType)
         {
-            this.type = groupRepositoryFactoryType;
-        }
+            if (!typeof(IGroupRepositoryFactory).IsAssignableFrom(groupRepositoryFactoryType) && (groupRepositoryFactoryType.IsAbstract || groupRepositoryFactoryType.IsInterface))
+            {
+                throw new ArgumentException("A Group repository factory must implement IGroupRepositoryFactory interface and must be a concrete class.");
+            }
 
-        public IGroupRepositoryFactory Create()
-        {
-            return (IGroupRepositoryFactory)Activator.CreateInstance(type)!;
+            this.FactoryType = groupRepositoryFactoryType;
         }
     }
 

diff --git a/src/MagicOnion.Server/MagicOnionEngine.cs b/src/MagicOnion.Server/MagicOnionEngine.cs
@@ -169,7 +169,7 @@ public static MagicOnionServiceDefinition BuildServerServiceDefinition(IServiceP
                         var attr = classType.GetCustomAttribute<GroupConfigurationAttribute>(true);
                         if (attr != null)
                         {
-                            factory = attr.Create();
+                            factory = (IGroupRepositoryFactory)ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider, attr.FactoryType);
                         }
                         else
                         {