using Activator.CreateInstance() to build aggregates w/ no public ctor.

Closes GH-2825
JasperFx · Nov 30, 2023 · 5aae5b6 · 5aae5b6
1 parent 497dde1
commit 5aae5b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/Marten/Events/CodeGeneration/AggregateEventProcessingFrame.cs b/src/Marten/Events/CodeGeneration/AggregateEventProcessingFrame.cs
@@ -84,7 +84,7 @@ public override void GenerateCode(GeneratedMethod method, ISourceWriter writer)
                 }
                 else if (defaultConstructor?.IsPublic == false)
                 {
-                    writer.Write($"{Aggregate.Usage} ??= AggregateBuilder();");
+                    writer.Write($"{Aggregate.Usage} ??= ({AggregateType.FullNameInCode()}){typeof(Activator).FullNameInCode()}.{nameof(Activator.CreateInstance)}(typeof({AggregateType.FullNameInCode()}), true);");
                 }
                 else
                 {

diff --git a/src/Marten/Events/CodeGeneration/DefaultAggregateConstruction.cs b/src/Marten/Events/CodeGeneration/DefaultAggregateConstruction.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Reflection;
+using FastExpressionCompiler;
 using JasperFx.CodeGeneration;
 using JasperFx.CodeGeneration.Frames;
 using JasperFx.CodeGeneration.Model;
@@ -13,7 +14,6 @@ internal class DefaultAggregateConstruction: SyncFrame
 {
     private readonly ConstructorInfo _constructor;
     private readonly Type _returnType;
-    private readonly Setter _setter;
     private Variable _event;
 
     public DefaultAggregateConstruction(Type returnType, GeneratedType generatedType)
@@ -23,13 +23,11 @@ public DefaultAggregateConstruction(Type returnType, GeneratedType generatedType
         _constructor = returnType.GetConstructor(
             BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, Type.EmptyTypes, null);
 
+
+
         if (_constructor != null && !_constructor.IsPublic)
         {
-            var ctor = Expression.New(_constructor);
-            var lambda = Expression.Lambda(ctor);
-            var func = lambda.Compile();
-            _setter = new Setter(func.GetType(), "AggregateBuilder") { InitialValue = func };
-            generatedType.Setters.Add(_setter);
+
         }
     }
 
@@ -53,9 +51,9 @@ public override void GenerateCode(GeneratedMethod method, ISourceWriter writer)
                 $"throw new {typeof(InvalidOperationException).FullNameInCode()}($\"There is no default constructor for {_returnType.FullNameInCode()}{AdditionalNoConstructorExceptionDetails}.\");"
             );
         }
-        else if (_setter != null)
+        else if (!_constructor.IsPublic)
         {
-            writer.WriteLine("return AggregateBuilder();");
+            writer.WriteLine($"return ({_returnType.FullNameInCode()}){typeof(Activator).FullNameInCode()}.{nameof(Activator.CreateInstance)}(typeof({_returnType.FullNameInCode()}), true);");
         }
         else
         {