diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyMapperBase.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperBase.cs similarity index 68% rename from framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyMapperBase.cs rename to framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperBase.cs index 6b7e9928ba..39d9dce995 100644 --- a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyMapperBase.cs +++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperBase.cs @@ -2,7 +2,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.Mapperly; -public abstract class AbpMapperlyMapperBase : IAbpMapperlyMapper, ITransientDependency +public abstract class MapperBase : IAbpMapperlyMapper, ITransientDependency { public abstract TDestination Map(TSource source); @@ -16,7 +16,7 @@ public abstract class AbpMapperlyMapperBase : IAbpMapperl } } -public abstract class AbpReverseMapperlyMapperBase : AbpMapperlyMapperBase, IAbpReverseMapperlyMapper +public abstract class TwoWayMapperBase : MapperBase, IAbpReverseMapperlyMapper { public abstract TSource ReverseMap(TDestination destination); diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyBeforeAndAfterMethod_Tests.cs b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyBeforeAndAfterMethod_Tests.cs index 94e2b4ef7e..1c07bff75b 100644 --- a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyBeforeAndAfterMethod_Tests.cs +++ b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyBeforeAndAfterMethod_Tests.cs @@ -22,7 +22,7 @@ public class MyClassDto } [Mapper] -public partial class MyClassMapper : AbpMapperlyMapperBase +public partial class MyClassMapper : MapperBase { public override partial MyClassDto Map(MyClass source); diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperly_Dependency_Injection_Tests.cs b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperly_Dependency_Injection_Tests.cs index ecc0f7ecde..1aa6288f3e 100644 --- a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperly_Dependency_Injection_Tests.cs +++ b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperly_Dependency_Injection_Tests.cs @@ -28,7 +28,7 @@ public class BirthdayCalculatorService : ITransientDependency } [Mapper] -public partial class MyDIClassMapper : AbpMapperlyMapperBase +public partial class MyDIClassMapper : MapperBase { private readonly BirthdayCalculatorService _birthdayCalculatorService; diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpReverseMapperly_Tests.cs b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpReverseMapperly_Tests.cs index 49c3c0ff4c..5eeebe6b82 100644 --- a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpReverseMapperly_Tests.cs +++ b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpReverseMapperly_Tests.cs @@ -22,7 +22,7 @@ public class MyReverseClassDto } [Mapper] -public partial class MyReverseClassMapper : AbpReverseMapperlyMapperBase +public partial class MyReverseClassMapper : TwoWayMapperBase { public override partial MyReverseClassDto Map(MyReverseClass source); diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/SampleClasses/MapperlyMappers.cs b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/SampleClasses/MapperlyMappers.cs index 22ba9be77e..49be64b61a 100644 --- a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/SampleClasses/MapperlyMappers.cs +++ b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/SampleClasses/MapperlyMappers.cs @@ -4,7 +4,7 @@ using Volo.Abp.Mapperly.SampleClasses; using Volo.Abp.ObjectExtending.TestObjects; [Mapper] -public partial class MyEntityMapper : AbpMapperlyMapperBase +public partial class MyEntityMapper : MapperBase { public override partial MyEntityDto Map(MyEntity source); @@ -12,7 +12,7 @@ public partial class MyEntityMapper : AbpMapperlyMapperBase +public partial class MyEnumMapper : MapperBase { public override partial MyEnumDto Map(MyEnum source); @@ -24,7 +24,7 @@ public partial class MyEnumMapper : AbpMapperlyMapperBase [Mapper] [MapExtraProperties(IgnoredProperties = ["CityName"])] -public partial class ExtensibleTestPersonMapper : AbpMapperlyMapperBase +public partial class ExtensibleTestPersonMapper : MapperBase { public override partial ExtensibleTestPersonDto Map(ExtensibleTestPerson source); @@ -33,7 +33,7 @@ public partial class ExtensibleTestPersonMapper : AbpMapperlyMapperBase +public partial class ExtensibleTestPersonWithRegularPropertiesDtoMapper : MapperBase { [MapperIgnoreTarget(nameof(ExtensibleTestPersonWithRegularPropertiesDto.Name))] [MapperIgnoreTarget(nameof(ExtensibleTestPersonWithRegularPropertiesDto.Age))]