Merge pull request #649 from DocSvartz/add-InterfaceNonPublicSetterAdapter

FIx Issue #537 - Step 3 - Separate Adapter for Interface with readolny props  from RecordTypeAdapter

Author: andrerav

src/Mapster/Adapters/ClassAdapter.cs

@@ -53,24 +53,7 @@ protected override bool CanInline(Expression source, Expression? destination, Co
         protected override Expression CreateInstantiationExpression(Expression source, Expression? destination, CompileArgument arg)
         {
             //new TDestination(src.Prop1, src.Prop2)
-
-            ///
-            //bool IsEnableNonPublicMembersAndNotPublicCtorWithoutParams(CompileArgument arg)
-            //{
-            //    if (arg.Settings.EnableNonPublicMembers == null)
-            //        return false;
-            //    if (arg.Settings.EnableNonPublicMembers == false)
-            //        return false;
-            //    else
-            //    {
-            //        if (arg.DestinationType.GetConstructors().Any(x => x.GetParameters() != null))
-            //        {
-            //            return true;
-            //        }
-            //    }
-            //    return false;
-            //}
-
+                        
             if (arg.GetConstructUsing() != null || arg.Settings.MapToConstructor == null)
                 return base.CreateInstantiationExpression(source, destination, arg);
 

src/Mapster/Adapters/ReadOnlyInterfaceAdapter.cs

@@ -0,0 +1,49 @@
+using Mapster.Utils;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Mapster.Adapters
+{
+    internal class ReadOnlyInterfaceAdapter : ClassAdapter
+    {
+        protected override int Score => -148;
+
+        protected override bool CanMap(PreCompileArgument arg)
+        {
+            return arg.DestinationType.IsInterface;
+        }
+
+        protected override bool CanInline(Expression source, Expression? destination, CompileArgument arg)
+        {
+            if (base.CanInline(source, destination, arg))
+                return true;
+            else
+                return false;
+            
+        }
+
+        protected override Expression CreateInstantiationExpression(Expression source, Expression? destination, CompileArgument arg)
+        {
+            var destintionType = arg.DestinationType;
+            var props = destintionType.GetFieldsAndProperties().ToList();
+
+            //interface with readonly props
+            if (props.Any(p => p.SetterModifier != AccessModifier.Public))
+            {
+                if (arg.GetConstructUsing() != null)
+                    return base.CreateInstantiationExpression(source, destination, arg);
+
+                var destType = DynamicTypeGenerator.GetTypeForInterface(arg.DestinationType, arg.Settings.Includes.Count > 0);
+                if (destType == null)
+                    return base.CreateInstantiationExpression(source, destination, arg);
+                var ctor = destType.GetConstructors()[0];
+                var classModel = GetConstructorModel(ctor, false);
+                var classConverter = CreateClassConverter(source, classModel, arg);
+                return CreateInstantiationExpression(source, classConverter, arg);
+            }
+            else
+                return base.CreateInstantiationExpression(source,destination, arg);
+        }
+
+    }
+}

src/Mapster/TypeAdapterConfig.cs

@@ -23,6 +23,7 @@ private static List<TypeAdapterRule> CreateRuleTemplate()
                 new PrimitiveAdapter().CreateRule(),    //-200
                 new ClassAdapter().CreateRule(),        //-150
                 new RecordTypeAdapter().CreateRule(),   //-149
+                new ReadOnlyInterfaceAdapter().CreateRule(), // -148
                 new CollectionAdapter().CreateRule(),   //-125
                 new DictionaryAdapter().CreateRule(),   //-124
                 new ArrayAdapter().CreateRule(),        //-123

src/Mapster/Utils/ReflectionUtils.cs

@@ -183,13 +183,6 @@ public static bool IsRecordType(this Type type)
 
             #endregion SupportingСurrentBehavior for Config Clone and Fork 
 
-            var props = type.GetFieldsAndProperties().ToList();
-
-            //interface with readonly props
-            if (type.GetTypeInfo().IsInterface &&
-                props.Any(p => p.SetterModifier != AccessModifier.Public))
-                return true;
-
            if(RecordTypeIdentityHelper.IsRecordType(type))
                 return true;