imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #1615 Add a prefix to AutoMap*Attribute.

Browse Source
pull/1616/head
maliming 6 years ago
parent d27e46afde
commit 7d5871a3ab
12 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

8
docs/en/Application-Services.md
Unescape View File

@ -146,7 +146,7 @@ public interface IBookAppService : IApplicationService
`BookDto` is a simple [DTO](Data-Transfer-Objects.md) class defined as below:
````csharp
[AutoMapFrom(typeof(Book))] //Defines the mapping
[AbpAutoMapFrom(typeof(Book))] //Defines the mapping
public class BookDto
{
public Guid Id { get; set; }
@ -159,7 +159,7 @@ public class BookDto
}
````
* `BookDto` defines `[AutoMapFrom(typeof(Book))]` attribute to create the object mapping from `Book` to `BookDto`.
* `BookDto` defines `[AbpAutoMapFrom(typeof(Book))]` attribute to create the object mapping from `Book` to `BookDto`.
Then you can implement the `GetAsync` method as shown below:
@ -248,7 +248,7 @@ public interface IAsyncCrudAppService<
DTO classes used in this example are `BookDto` and `CreateUpdateBookDto`:
````csharp
[AutoMapFrom(typeof(Book))]
[AbpAutoMapFrom(typeof(Book))]
public class BookDto : AuditedEntityDto<Guid>
{
public string Name { get; set; }
@ -258,7 +258,7 @@ public class BookDto : AuditedEntityDto<Guid>
public float Price { get; set; }
}
[AutoMapTo(typeof(Book))]
[AbpAutoMapTo(typeof(Book))]
public class CreateUpdateBookDto
{
[Required]

8
docs/zh-Hans/Application-Services.md
Unescape View File

@ -146,7 +146,7 @@ public interface IBookAppService : IApplicationService
`BookDto`是一个简单的[DTO](Data-Transfer-Objects.md)类, 定义如下:
````csharp
[AutoMapFrom(typeof(Book))] //Defines the mapping
[AbpAutoMapFrom(typeof(Book))] //Defines the mapping
public class BookDto
{
public Guid Id { get; set; }
@ -159,7 +159,7 @@ public class BookDto
}
````
* `BookDto`定义了`[AutoMapFrom(typeof(Book))]`属性来从创建对象映射Book到BookDto.
* `BookDto`定义了`[AbpAutoMapFrom(typeof(Book))]`属性来从创建对象映射Book到BookDto.
然后你可以实现`GetAsync`方法. 如下所示:
@ -247,7 +247,7 @@ public interface IAsyncCrudAppService<
示例中使用的DTO类是`BookDto`和`CreateUpdateBookDto`:
````csharp
[AutoMapFrom(typeof(Book))]
[AbpAutoMapFrom(typeof(Book))]
public class BookDto : AuditedEntityDto<Guid>
{
public string Name { get; set; }
@ -257,7 +257,7 @@ public class BookDto : AuditedEntityDto<Guid>
public float Price { get; set; }
}
[AutoMapTo(typeof(Book))]
[AbpAutoMapTo(typeof(Book))]
public class CreateUpdateBookDto
{
[Required]

4
framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapAttribute.cs → framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapAttribute.cs
Unescape View File

@ -4,9 +4,9 @@ using AutoMapper;
namespace Volo.Abp.AutoMapper
{
public class AutoMapAttribute : AutoMapAttributeBase
public class AbpAutoMapAttribute : AbpAutoMapAttributeBase
{
public AutoMapAttribute(params Type[] targetTypes)
public AbpAutoMapAttribute(params Type[] targetTypes)
: base(targetTypes)
{

4
framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapAttributeBase.cs → framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapAttributeBase.cs
Unescape View File

@ -3,11 +3,11 @@ using AutoMapper;
namespace Volo.Abp.AutoMapper
{
public abstract class AutoMapAttributeBase : Attribute
public abstract class AbpAutoMapAttributeBase : Attribute
{
public Type[] TargetTypes { get; }
protected AutoMapAttributeBase(params Type[] targetTypes)
protected AbpAutoMapAttributeBase(params Type[] targetTypes)
{
TargetTypes = targetTypes;
}

6
framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapFromAttribute.cs → framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapFromAttribute.cs
Unescape View File

@ -4,17 +4,17 @@ using AutoMapper;
namespace Volo.Abp.AutoMapper
{
public class AutoMapFromAttribute : AutoMapAttributeBase
public class AbpAutoMapFromAttribute : AbpAutoMapAttributeBase
{
public MemberList MemberList { get; set; } = MemberList.Destination;
public AutoMapFromAttribute(params Type[] targetTypes)
public AbpAutoMapFromAttribute(params Type[] targetTypes)
: base(targetTypes)
{
}
public AutoMapFromAttribute(MemberList memberList, params Type[] targetTypes)
public AbpAutoMapFromAttribute(MemberList memberList, params Type[] targetTypes)
: this(targetTypes)
{
MemberList = memberList;

6
framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapToAttribute.cs → framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapToAttribute.cs
Unescape View File

@ -4,17 +4,17 @@ using AutoMapper;
namespace Volo.Abp.AutoMapper
{
public class AutoMapToAttribute : AutoMapAttributeBase
public class AbpAutoMapToAttribute : AbpAutoMapAttributeBase
{
public MemberList MemberList { get; set; } = MemberList.Source;
public AutoMapToAttribute(params Type[] targetTypes)
public AbpAutoMapToAttribute(params Type[] targetTypes)
: base(targetTypes)
{
}
public AutoMapToAttribute(MemberList memberList, params Type[] targetTypes)
public AbpAutoMapToAttribute(MemberList memberList, params Type[] targetTypes)
: this(targetTypes)
{
MemberList = memberList;

6
framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs
Unescape View File

@ -70,9 +70,9 @@ namespace Volo.Abp.AutoMapper
var types = typeFinder.Types.Where(type =>
{
var typeInfo = type.GetTypeInfo();
return typeInfo.IsDefined(typeof(AutoMapAttribute)) ||
typeInfo.IsDefined(typeof(AutoMapFromAttribute)) ||
typeInfo.IsDefined(typeof(AutoMapToAttribute));
return typeInfo.IsDefined(typeof(AbpAutoMapAttribute)) ||
typeInfo.IsDefined(typeof(AbpAutoMapFromAttribute)) ||
typeInfo.IsDefined(typeof(AbpAutoMapToAttribute));
}
).ToArray();

2
framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperConfigurationExtensions.cs
Unescape View File

@ -8,7 +8,7 @@ namespace Volo.Abp.AutoMapper
{
public static void CreateAutoAttributeMaps(this IMapperConfigurationExpression configuration, Type type)
{
foreach (var autoMapAttribute in type.GetTypeInfo().GetCustomAttributes<AutoMapAttributeBase>())
foreach (var autoMapAttribute in type.GetTypeInfo().GetCustomAttributes<AbpAutoMapAttributeBase>())
{
autoMapAttribute.CreateMap(configuration, type);
}

6
framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_Inheritance_Tests.cs
Unescape View File

@ -38,7 +38,7 @@ namespace Volo.Abp.AutoMapper
}
[AutoMapFrom(typeof(MyBaseClass))]
[AbpAutoMapFrom(typeof(MyBaseClass))]
public class MyTargetClassToMap
{
public string Value { get; set; }
@ -63,13 +63,13 @@ namespace Volo.Abp.AutoMapper
private class EntityProxy : DerivedEntity { }
[AutoMapFrom(typeof(Entity))]
[AbpAutoMapFrom(typeof(Entity))]
private class EntityDto
{
public string Value { get; set; }
}
[AutoMapFrom(typeof(DerivedEntity))]
[AbpAutoMapFrom(typeof(DerivedEntity))]
private class DerivedEntityDto : EntityDto { }
}
}

4
framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapping_Tests.cs
Unescape View File

@ -128,7 +128,7 @@ namespace Volo.Abp.AutoMapper
obj2.NullableValue.ShouldBe(42);
}
[AutoMap(typeof(MyClass2), typeof(MyClass3))]
[AbpAutoMap(typeof(MyClass2), typeof(MyClass3))]
private class MyClass1
{
public string TestProp { get; set; }
@ -136,7 +136,7 @@ namespace Volo.Abp.AutoMapper
public long? NullableValue { get; set; }
}
[AutoMapTo(typeof(MyClass3))]
[AbpAutoMapTo(typeof(MyClass3))]
private class MyClass2
{
public string TestProp { get; set; }

2
framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs
Unescape View File

@ -2,7 +2,7 @@
namespace Volo.Abp.AutoMapper.SampleClasses
{
[AutoMap(typeof(MyEntity))]
[AbpAutoMap(typeof(MyEntity))]
public class MyEntityDto
{
public Guid Id { get; set; }

2
framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs
Unescape View File

@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
namespace Volo.Abp.TestApp.Domain
{
[AutoMapTo(typeof(PersonEto))]
[AbpAutoMapTo(typeof(PersonEto))]
public class Person : FullAuditedAggregateRoot<Guid>, IMultiTenant
{
public virtual Guid? TenantId { get; set; }

Write Preview
Loading…
Cancel
Save