Browse Source

Enable nullable annotations for Volo.Abp.Application.Contracts

pull/17303/head
liangshiwei 3 years ago
parent
commit
bf608c6a57
  1. 2
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.csproj
  2. 8
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs
  3. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs
  4. 2
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/EntityDto.cs
  5. 8
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleAuditedEntityWithUserDto.cs
  6. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleCreationAuditedEntityWithUserDto.cs
  7. 2
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleEntityDto.cs
  8. 12
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleFullAuditedEntityWithUserDto.cs
  9. 12
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs
  10. 2
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ISortedResultRequest.cs
  11. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs
  12. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ListResultDto.cs
  13. 4
      framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs
  14. 3
      framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs
  15. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs

2
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.Ddd.Application.Contracts</AssemblyName>
<PackageId>Volo.Abp.Ddd.Application.Contracts</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

8
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs

@ -12,10 +12,10 @@ namespace Volo.Abp.Application.Dtos;
public abstract class AuditedEntityWithUserDto<TUserDto> : AuditedEntityDto, IAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
}
/// <summary>
@ -28,8 +28,8 @@ public abstract class AuditedEntityWithUserDto<TUserDto> : AuditedEntityDto, IAu
public abstract class AuditedEntityWithUserDto<TPrimaryKey, TUserDto> : AuditedEntityDto<TPrimaryKey>, IAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
}

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs

@ -11,7 +11,7 @@ namespace Volo.Abp.Application.Dtos;
[Serializable]
public abstract class CreationAuditedEntityWithUserDto<TUserDto> : CreationAuditedEntityDto, ICreationAuditedObject<TUserDto>
{
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
}
/// <summary>
@ -23,5 +23,5 @@ public abstract class CreationAuditedEntityWithUserDto<TUserDto> : CreationAudit
[Serializable]
public abstract class CreationAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : CreationAuditedEntityDto<TPrimaryKey>, ICreationAuditedObject<TUserDto>
{
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
}

2
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/EntityDto.cs

@ -17,7 +17,7 @@ public abstract class EntityDto<TKey> : EntityDto, IEntityDto<TKey>
/// <summary>
/// Id of the entity.
/// </summary>
public TKey Id { get; set; }
public TKey Id { get; set; } = default!;
public override string ToString()
{

8
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleAuditedEntityWithUserDto.cs

@ -15,10 +15,10 @@ namespace Volo.Abp.Application.Dtos;
public abstract class ExtensibleAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleAuditedEntityDto<TPrimaryKey>, IAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
protected ExtensibleAuditedEntityWithUserDto()
: this(true)
@ -44,10 +44,10 @@ public abstract class ExtensibleAuditedEntityWithUserDto<TUserDto> : ExtensibleA
IAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
protected ExtensibleAuditedEntityWithUserDto()
: this(true)

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleCreationAuditedEntityWithUserDto.cs

@ -14,7 +14,7 @@ namespace Volo.Abp.Application.Dtos;
[Serializable]
public abstract class ExtensibleCreationAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleCreationAuditedEntityDto<TPrimaryKey>, ICreationAuditedObject<TUserDto>
{
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
protected ExtensibleCreationAuditedEntityWithUserDto()
: this(true)
@ -39,7 +39,7 @@ public abstract class ExtensibleCreationAuditedEntityWithUserDto<TPrimaryKey, TU
public abstract class ExtensibleCreationAuditedEntityWithUserDto<TUserDto> : ExtensibleCreationAuditedEntityDto,
ICreationAuditedObject<TUserDto>
{
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
protected ExtensibleCreationAuditedEntityWithUserDto()
: this(true)

2
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleEntityDto.cs

@ -9,7 +9,7 @@ public abstract class ExtensibleEntityDto<TKey> : ExtensibleObject, IEntityDto<T
/// <summary>
/// Id of the entity.
/// </summary>
public TKey Id { get; set; }
public TKey Id { get; set; } = default!;
protected ExtensibleEntityDto()
: this(true)

12
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ExtensibleFullAuditedEntityWithUserDto.cs

@ -15,13 +15,13 @@ namespace Volo.Abp.Application.Dtos;
public abstract class ExtensibleFullAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : ExtensibleFullAuditedEntityDto<TPrimaryKey>, IFullAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
/// <inheritdoc />
public TUserDto Deleter { get; set; }
public TUserDto? Deleter { get; set; }
protected ExtensibleFullAuditedEntityWithUserDto()
: this(true)
@ -47,13 +47,13 @@ public abstract class ExtensibleFullAuditedEntityWithUserDto<TUserDto> : Extensi
IFullAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
/// <inheritdoc />
public TUserDto Deleter { get; set; }
public TUserDto? Deleter { get; set; }
protected ExtensibleFullAuditedEntityWithUserDto()
: this(true)

12
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs

@ -12,13 +12,13 @@ namespace Volo.Abp.Application.Dtos;
public abstract class FullAuditedEntityWithUserDto<TUserDto> : FullAuditedEntityDto, IFullAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
/// <inheritdoc />
public TUserDto Deleter { get; set; }
public TUserDto? Deleter { get; set; }
}
/// <summary>
@ -31,11 +31,11 @@ public abstract class FullAuditedEntityWithUserDto<TUserDto> : FullAuditedEntity
public abstract class FullAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : FullAuditedEntityDto<TPrimaryKey>, IFullAuditedObject<TUserDto>
{
/// <inheritdoc />
public TUserDto Creator { get; set; }
public TUserDto? Creator { get; set; }
/// <inheritdoc />
public TUserDto LastModifier { get; set; }
public TUserDto? LastModifier { get; set; }
/// <inheritdoc />
public TUserDto Deleter { get; set; }
public TUserDto? Deleter { get; set; }
}

2
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ISortedResultRequest.cs

@ -16,5 +16,5 @@ public interface ISortedResultRequest
/// "Name DESC"
/// "Name ASC, Age DESC"
/// </example>
string Sorting { get; set; }
string? Sorting { get; set; }
}

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs

@ -42,7 +42,7 @@ public class LimitedResultRequestDto : ILimitedResultRequest, IValidatableObject
"MaxResultCountExceededExceptionMessage",
nameof(MaxResultCount),
MaxMaxResultCount,
typeof(LimitedResultRequestDto).FullName,
typeof(LimitedResultRequestDto).FullName!,
nameof(MaxMaxResultCount)
],
new[] { nameof(MaxResultCount) });
@ -90,7 +90,7 @@ public class ExtensibleLimitedResultRequestDto : ExtensibleEntityDto, ILimitedRe
"MaxResultCountExceededExceptionMessage",
nameof(MaxResultCount),
MaxMaxResultCount,
typeof(ExtensibleLimitedResultRequestDto).FullName,
typeof(ExtensibleLimitedResultRequestDto).FullName!,
nameof(MaxMaxResultCount)
],
new[] { nameof(MaxResultCount) });

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/ListResultDto.cs

@ -13,7 +13,7 @@ public class ListResultDto<T> : IListResult<T>
get { return _items ?? (_items = new List<T>()); }
set { _items = value; }
}
private IReadOnlyList<T> _items;
private IReadOnlyList<T>? _items;
/// <summary>
/// Creates a new <see cref="ListResultDto{T}"/> object.
@ -42,7 +42,7 @@ public class ExtensibleListResultDto<T> : ExtensibleObject, IListResult<T>
get { return _items ?? (_items = new List<T>()); }
set { _items = value; }
}
private IReadOnlyList<T> _items;
private IReadOnlyList<T>? _items;
/// <summary>
/// Creates a new <see cref="ListResultDto{T}"/> object.

4
framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs

@ -8,7 +8,7 @@ namespace Volo.Abp.Application.Dtos;
[Serializable]
public class PagedAndSortedResultRequestDto : PagedResultRequestDto, IPagedAndSortedResultRequest
{
public virtual string Sorting { get; set; }
public virtual string? Sorting { get; set; }
}
/// <summary>
@ -17,5 +17,5 @@ public class PagedAndSortedResultRequestDto : PagedResultRequestDto, IPagedAndSo
[Serializable]
public class ExtensiblePagedAndSortedResultRequestDto : ExtensiblePagedResultRequestDto, IPagedAndSortedResultRequest
{
public virtual string Sorting { get; set; }
public virtual string? Sorting { get; set; }
}

3
framework/src/Volo.Abp.Ddd.Domain.Shared/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs

@ -4,6 +4,5 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed;
public interface IEntityToEtoMapper
{
[CanBeNull]
object Map(object entityObj);
object? Map(object entityObj);
}

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs

@ -36,7 +36,7 @@ public class EntityToEtoMapper : IEntityToEtoMapper, ITransientDependency
if (etoMappingItem == null)
{
var keys = entity.GetKeys().JoinAsString(",");
return new EntityEto(entityType.FullName, keys);
return new EntityEto(entityType.FullName!, keys);
}
using (var scope = HybridServiceScopeFactory.CreateScope())

Loading…
Cancel
Save