Browse Source

Fixed misleading parameter variable names of ReverseMap methods.

The ReverseMap methods will map the destination type back to the source type, but the "source" object will be of type TDestination.   In other words, the "TDestination source" object is copied to the "TSource destination" object.
pull/24266/head
Eric Johnson 2 months ago
parent
commit
8dd055581d
  1. 12
      docs/en/framework/infrastructure/object-to-object-mapping.md
  2. 8
      docs/en/release-info/migration-guides/AutoMapper-To-Mapperly.md
  3. 8
      framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/IAbpMapperlyMapper.cs
  4. 8
      framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperBase.cs
  5. 8
      framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpReverseMapperly_Tests.cs
  6. 36
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebMappers.cs
  7. 4
      modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationMappers.cs
  8. 8
      modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs

12
docs/en/framework/infrastructure/object-to-object-mapping.md

@ -252,8 +252,8 @@ public partial class UserToUserDtoMapper : TwoWayMapperBase<User, UserDto>
public override partial UserDto Map(User source);
public override partial void Map(User source, UserDto destination);
public override partial User ReverseMap(UserDto destination);
public override partial void ReverseMap(UserDto destination, User source);
public override partial User ReverseMap(UserDto source);
public override partial void ReverseMap(UserDto source, User destination);
}
````
@ -278,15 +278,15 @@ public partial class UserToUserDtoMapper : TwoWayMapperBase<User, UserDto>
//TODO: Perform actions after the mapping
}
public override partial User ReverseMap(UserDto destination);
public override partial void ReverseMap(UserDto destination, User source);
public override partial User ReverseMap(UserDto source);
public override partial void ReverseMap(UserDto source, User destination);
public override partial void BeforeReverseMap(UserDto destination)
public override partial void BeforeReverseMap(UserDto source)
{
//TODO: Perform actions before the reverse mapping
}
public override partial void AfterReverseMap(UserDto destination, User source)
public override partial void AfterReverseMap(UserDto source, User destination)
{
//TODO: Perform actions after the reverse mapping
}

8
docs/en/release-info/migration-guides/AutoMapper-To-Mapperly.md

@ -93,8 +93,8 @@ public partial class OrganizationUnitRoleToOrganizationUnitRoleDtoMapper : TwoWa
public override partial OrganizationUnitRoleDto Map(OrganizationUnitRole source);
public override partial void Map(OrganizationUnitRole source, OrganizationUnitRoleDto destination);
public override partial OrganizationUnitRole ReverseMap(OrganizationUnitRoleDto destination);
public override partial void ReverseMap(OrganizationUnitRoleDto destination, OrganizationUnitRole source);
public override partial OrganizationUnitRole ReverseMap(OrganizationUnitRoleDto source);
public override partial void ReverseMap(OrganizationUnitRoleDto source, OrganizationUnitRole destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -292,8 +292,8 @@ public partial class OrganizationUnitRoleToOrganizationUnitRoleDtoMapper : TwoWa
public override partial OrganizationUnitRoleDto Map(OrganizationUnitRole source);
public override partial void Map(OrganizationUnitRole source, OrganizationUnitRoleDto destination);
public override partial OrganizationUnitRole ReverseMap(OrganizationUnitRoleDto destination);
public override partial void ReverseMap(OrganizationUnitRoleDto destination, OrganizationUnitRole source);
public override partial OrganizationUnitRole ReverseMap(OrganizationUnitRoleDto source);
public override partial void ReverseMap(OrganizationUnitRoleDto source, OrganizationUnitRole destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]

8
framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/IAbpMapperlyMapper.cs

@ -13,11 +13,11 @@ public interface IAbpMapperlyMapper<in TSource, TDestination>
public interface IAbpReverseMapperlyMapper<TSource, TDestination> : IAbpMapperlyMapper<TSource, TDestination>
{
TSource ReverseMap(TDestination destination);
TSource ReverseMap(TDestination source);
void ReverseMap(TDestination destination, TSource source);
void ReverseMap(TDestination source, TSource destination);
void BeforeReverseMap(TDestination destination);
void BeforeReverseMap(TDestination source);
void AfterReverseMap(TDestination destination, TSource source);
void AfterReverseMap(TDestination source, TSource destination);
}

8
framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperBase.cs

@ -18,15 +18,15 @@ public abstract class MapperBase<TSource, TDestination> : IAbpMapperlyMapper<TSo
public abstract class TwoWayMapperBase<TSource, TDestination> : MapperBase<TSource, TDestination>, IAbpReverseMapperlyMapper<TSource, TDestination>
{
public abstract TSource ReverseMap(TDestination destination);
public abstract TSource ReverseMap(TDestination source);
public abstract void ReverseMap(TDestination destination, TSource source);
public abstract void ReverseMap(TDestination source, TSource destination);
public virtual void BeforeReverseMap(TDestination destination)
public virtual void BeforeReverseMap(TDestination source)
{
}
public virtual void AfterReverseMap(TDestination destination, TSource source)
public virtual void AfterReverseMap(TDestination source, TSource destination)
{
}
}

8
framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpReverseMapperly_Tests.cs

@ -28,16 +28,16 @@ public partial class MyReverseClassMapper : TwoWayMapperBase<MyReverseClass, MyR
public override partial void Map(MyReverseClass source, MyReverseClassDto destination);
public override partial MyReverseClass ReverseMap(MyReverseClassDto destination);
public override partial MyReverseClass ReverseMap(MyReverseClassDto source);
public override partial void ReverseMap(MyReverseClassDto destination, MyReverseClass source);
public override partial void ReverseMap(MyReverseClassDto source, MyReverseClass destination);
public override void BeforeReverseMap(MyReverseClassDto destination)
public override void BeforeReverseMap(MyReverseClassDto source)
{
destination.Name = "BeforeReverseMap " + destination.Name;
}
public override void AfterReverseMap(MyReverseClassDto destination, MyReverseClass source)
public override void AfterReverseMap(MyReverseClassDto source, MyReverseClass destination)
{
source.Name = destination.Name + " AfterReverseMap";
}

36
modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebMappers.cs

@ -19,8 +19,8 @@ public partial class BlogFeatureInputDtoToBlogFeatureViewModelMapper : TwoWayMap
public override partial FeaturesModalModel.BlogFeatureViewModel Map(BlogFeatureInputDto source);
public override partial void Map(BlogFeatureInputDto source, FeaturesModalModel.BlogFeatureViewModel destination);
public override partial BlogFeatureInputDto ReverseMap(FeaturesModalModel.BlogFeatureViewModel destination);
public override partial void ReverseMap(FeaturesModalModel.BlogFeatureViewModel destination, BlogFeatureInputDto source);
public override partial BlogFeatureInputDto ReverseMap(FeaturesModalModel.BlogFeatureViewModel source);
public override partial void ReverseMap(FeaturesModalModel.BlogFeatureViewModel source, BlogFeatureInputDto destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -29,8 +29,8 @@ public partial class BlogFeatureDtoToBlogFeatureViewModelMapper : TwoWayMapperBa
public override partial FeaturesModalModel.BlogFeatureViewModel Map(BlogFeatureDto source);
public override partial void Map(BlogFeatureDto source, FeaturesModalModel.BlogFeatureViewModel destination);
public override partial BlogFeatureDto ReverseMap(FeaturesModalModel.BlogFeatureViewModel destination);
public override partial void ReverseMap(FeaturesModalModel.BlogFeatureViewModel destination, BlogFeatureDto source);
public override partial BlogFeatureDto ReverseMap(FeaturesModalModel.BlogFeatureViewModel source);
public override partial void ReverseMap(FeaturesModalModel.BlogFeatureViewModel source, BlogFeatureDto destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -39,8 +39,8 @@ public partial class CreateBlogPostDtoToCreateBlogPostViewModelMapper : TwoWayMa
public override partial CreateModel.CreateBlogPostViewModel Map(CreateBlogPostDto source);
public override partial void Map(CreateBlogPostDto source, CreateModel.CreateBlogPostViewModel destination);
public override partial CreateBlogPostDto ReverseMap(CreateModel.CreateBlogPostViewModel destination);
public override partial void ReverseMap(CreateModel.CreateBlogPostViewModel destination, CreateBlogPostDto source);
public override partial CreateBlogPostDto ReverseMap(CreateModel.CreateBlogPostViewModel source);
public override partial void ReverseMap(CreateModel.CreateBlogPostViewModel source, CreateBlogPostDto destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -49,8 +49,8 @@ public partial class TagUpdateDtoToTagEditViewModelMapper : TwoWayMapperBase<Tag
public override partial EditModalModel.TagEditViewModel Map(TagUpdateDto source);
public override partial void Map(TagUpdateDto source, EditModalModel.TagEditViewModel destination);
public override partial TagUpdateDto ReverseMap(EditModalModel.TagEditViewModel destination);
public override partial void ReverseMap(EditModalModel.TagEditViewModel destination, TagUpdateDto source);
public override partial TagUpdateDto ReverseMap(EditModalModel.TagEditViewModel source);
public override partial void ReverseMap(EditModalModel.TagEditViewModel source, TagUpdateDto destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -78,9 +78,9 @@ public partial class UpdateBlogPostViewModelToUpdateBlogPostDtoMapper : TwoWayMa
public override partial void Map(UpdateModel.UpdateBlogPostViewModel source, UpdateBlogPostDto destination);
public override partial UpdateModel.UpdateBlogPostViewModel ReverseMap(UpdateBlogPostDto destination);
public override partial UpdateModel.UpdateBlogPostViewModel ReverseMap(UpdateBlogPostDto source);
public override partial void ReverseMap(UpdateBlogPostDto destination, UpdateModel.UpdateBlogPostViewModel source);
public override partial void ReverseMap(UpdateBlogPostDto source, UpdateModel.UpdateBlogPostViewModel destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -126,9 +126,9 @@ public partial class MenuItemUpdateViewModelToMenuItemCreateInputMapper : TwoWay
public override partial MenuItemCreateInput Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel source);
public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel source, MenuItemCreateInput destination);
public override partial Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel ReverseMap(MenuItemCreateInput destination);
public override partial Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel ReverseMap(MenuItemCreateInput source);
public override partial void ReverseMap(MenuItemCreateInput destination, Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel source);
public override partial void ReverseMap(MenuItemCreateInput source, Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -165,9 +165,9 @@ public partial class CreatePageViewModelToCreatePageInputDtoMapper : TwoWayMappe
public override partial CreatePageInputDto Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.CreateModel.CreatePageViewModel source);
public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.CreateModel.CreatePageViewModel source, CreatePageInputDto destination);
public override partial Pages.CmsKit.Pages.CreateModel.CreatePageViewModel ReverseMap(CreatePageInputDto destination);
public override partial Pages.CmsKit.Pages.CreateModel.CreatePageViewModel ReverseMap(CreatePageInputDto source);
public override partial void ReverseMap(CreatePageInputDto destination, Pages.CmsKit.Pages.CreateModel.CreatePageViewModel source);
public override partial void ReverseMap(CreatePageInputDto source, Pages.CmsKit.Pages.CreateModel.CreatePageViewModel destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -178,9 +178,9 @@ public partial class UpdatePageViewModelToUpdatePageInputDtoMapper : TwoWayMappe
public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel source, UpdatePageInputDto destination);
public override partial Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel ReverseMap(UpdatePageInputDto destination);
public override partial Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel ReverseMap(UpdatePageInputDto source);
public override partial void ReverseMap(UpdatePageInputDto destination, Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel source);
public override partial void ReverseMap(UpdatePageInputDto source, Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -190,9 +190,9 @@ public partial class TagCreateViewModelToTagCreateDtoMapper : TwoWayMapperBase<C
public override partial TagCreateDto Map(CreateModalModel.TagCreateViewModel source);
public override partial void Map(CreateModalModel.TagCreateViewModel source, TagCreateDto destination);
public override partial CreateModalModel.TagCreateViewModel ReverseMap(TagCreateDto destination);
public override partial CreateModalModel.TagCreateViewModel ReverseMap(TagCreateDto source);
public override partial void ReverseMap(TagCreateDto destination, CreateModalModel.TagCreateViewModel source);
public override partial void ReverseMap(TagCreateDto source, CreateModalModel.TagCreateViewModel destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]

4
modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationMappers.cs

@ -13,8 +13,8 @@ public partial class OrganizationUnitRoleToOrganizationUnitRoleDtoMapper : TwoWa
public override partial BlogFeatureDto Map(BlogFeatureCacheItem source);
public override partial void Map(BlogFeatureCacheItem source, BlogFeatureDto destination);
public override partial BlogFeatureCacheItem ReverseMap(BlogFeatureDto destination);
public override partial void ReverseMap(BlogFeatureDto destination, BlogFeatureCacheItem source);
public override partial BlogFeatureCacheItem ReverseMap(BlogFeatureDto source);
public override partial void ReverseMap(BlogFeatureDto source, BlogFeatureCacheItem destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]

8
modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs

@ -13,8 +13,8 @@ public partial class PageDtoToPageViewModelMapper : TwoWayMapperBase<PageDto, Pa
public override partial PageViewModel Map(PageDto source);
public override partial void Map(PageDto source, PageViewModel destination);
public override partial PageDto ReverseMap(PageViewModel destination);
public override partial void ReverseMap(PageViewModel destination, PageDto source);
public override partial PageDto ReverseMap(PageViewModel source);
public override partial void ReverseMap(PageViewModel source, PageDto destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
@ -23,8 +23,8 @@ public partial class BlogPostCommonDtoToBlogPostViewModelMapper : TwoWayMapperBa
public override partial BlogPostViewModel Map(BlogPostCommonDto source);
public override partial void Map(BlogPostCommonDto source, BlogPostViewModel destination);
public override partial BlogPostCommonDto ReverseMap(BlogPostViewModel destination);
public override partial void ReverseMap(BlogPostViewModel destination, BlogPostCommonDto source);
public override partial BlogPostCommonDto ReverseMap(BlogPostViewModel source);
public override partial void ReverseMap(BlogPostViewModel source, BlogPostCommonDto destination);
}
[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]

Loading…
Cancel
Save