Browse Source

Enable nullable annotations for Volo.Abp.BlobStoring.Minio

pull/17120/head
liangshiwei 3 years ago
parent
commit
f96c6cdea6
  1. 2
      framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj
  2. 4
      framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs
  3. 2
      framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProviderConfiguration.cs

2
framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj

@ -4,6 +4,8 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.BlobStoring.Minio</AssemblyName> <AssemblyName>Volo.Abp.BlobStoring.Minio</AssemblyName>
<PackageId>Volo.Abp.BlobStoring.Minio</PackageId> <PackageId>Volo.Abp.BlobStoring.Minio</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

4
framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs

@ -69,7 +69,7 @@ public class MinioBlobProvider : BlobProviderBase, ITransientDependency
return await BlobExistsAsync(client, containerName, blobName); return await BlobExistsAsync(client, containerName, blobName);
} }
public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args) public override async Task<Stream?> GetOrNullAsync(BlobProviderGetArgs args)
{ {
var blobName = MinioBlobNameCalculator.Calculate(args); var blobName = MinioBlobNameCalculator.Calculate(args);
var client = GetMinioClient(args); var client = GetMinioClient(args);
@ -152,6 +152,6 @@ public class MinioBlobProvider : BlobProviderBase, ITransientDependency
return configuration.BucketName.IsNullOrWhiteSpace() return configuration.BucketName.IsNullOrWhiteSpace()
? args.ContainerName ? args.ContainerName
: BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.BucketName); : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.BucketName!);
} }
} }

2
framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProviderConfiguration.cs

@ -2,7 +2,7 @@
public class MinioBlobProviderConfiguration public class MinioBlobProviderConfiguration
{ {
public string BucketName { public string? BucketName {
get => _containerConfiguration.GetConfigurationOrDefault<string>(MinioBlobProviderConfigurationNames.BucketName); get => _containerConfiguration.GetConfigurationOrDefault<string>(MinioBlobProviderConfigurationNames.BucketName);
set => _containerConfiguration.SetConfiguration(MinioBlobProviderConfigurationNames.BucketName, value); set => _containerConfiguration.SetConfiguration(MinioBlobProviderConfigurationNames.BucketName, value);
} }

Loading…
Cancel
Save