From 37ecd32d222fc8e8f0fd76493c247220731459fc Mon Sep 17 00:00:00 2001
From: liangshiwei <shiwei.liang@volosoft.com>
Date: Tue, 5 Sep 2023 17:28:43 +0800
Subject: [PATCH] Enable nullable annotations for Volo.Abp.Imaging.* projets

---
 .../Volo.Abp.Imaging.Abstractions.csproj                    | 2 ++
 .../Volo/Abp/Imaging/IImageCompressor.cs                    | 4 ++--
 .../Volo/Abp/Imaging/IImageCompressorContributor.cs         | 4 ++--
 .../Volo/Abp/Imaging/IImageResizer.cs                       | 4 ++--
 .../Volo/Abp/Imaging/IImageResizerContributor.cs            | 4 ++--
 .../Volo/Abp/Imaging/ImageCompressor.cs                     | 4 ++--
 .../Volo/Abp/Imaging/ImageResizer.cs                        | 4 ++--
 .../Volo.Abp.Imaging.AspNetCore.csproj                      | 2 ++
 .../Volo/Abp/Imaging/CompressImageAttribute.cs              | 2 +-
 .../Volo/Abp/Imaging/ResizeImageAttribute.cs                | 2 +-
 .../Volo.Abp.Imaging.ImageSharp.csproj                      | 2 ++
 .../Abp/Imaging/ImageSharpImageCompressorContributor.cs     | 6 +++---
 .../Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs   | 6 +++---
 .../Volo.Abp.Imaging.MagickNet.csproj                       | 2 ++
 .../Volo/Abp/Imaging/MagickImageCompressorContributor.cs    | 6 +++---
 .../Volo/Abp/Imaging/MagickImageResizerContributor.cs       | 6 +++---
 16 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.csproj b/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.csproj
index 6b7c0434ed..288f43c7d4 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.csproj
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.csproj
@@ -5,6 +5,8 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>Nullable</WarningsAsErrors>
         <PackageId>Volo.Abp.Imaging.Abstractions</PackageId>
         <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressor.cs
index 949a3fb848..6d80cd1c6b 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressor.cs
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressor.cs
@@ -9,13 +9,13 @@ public interface IImageCompressor
 {
     Task<ImageCompressResult<Stream>> CompressAsync(
         Stream stream,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default
     );
 
     Task<ImageCompressResult<byte[]>> CompressAsync(
         byte[] bytes,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default
     );
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressorContributor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressorContributor.cs
index 84087d983a..7fc9362c77 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressorContributor.cs
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressorContributor.cs
@@ -9,10 +9,10 @@ public interface IImageCompressorContributor
 {
     Task<ImageCompressResult<Stream>> TryCompressAsync(
         Stream stream, 
-        [CanBeNull] string mimeType = null, 
+        string? mimeType = null, 
         CancellationToken cancellationToken = default);
     Task<ImageCompressResult<byte[]>> TryCompressAsync(
         byte[] bytes, 
-        [CanBeNull] string mimeType = null, 
+        string? mimeType = null, 
         CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizer.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizer.cs
index c2ae1b62e9..2c9c2878ed 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizer.cs
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizer.cs
@@ -10,14 +10,14 @@ public interface IImageResizer
     Task<ImageResizeResult<Stream>> ResizeAsync(
         Stream stream,
         ImageResizeArgs resizeArgs,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default
     );
 
     Task<ImageResizeResult<byte[]>> ResizeAsync(
         byte[] bytes,
         ImageResizeArgs resizeArgs,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default
     );
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizerContributor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizerContributor.cs
index fed4ce4a4c..a6603ea136 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizerContributor.cs
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizerContributor.cs
@@ -10,12 +10,12 @@ public interface IImageResizerContributor
     Task<ImageResizeResult<Stream>> TryResizeAsync(
         Stream stream, 
         ImageResizeArgs resizeArgs, 
-        [CanBeNull] string mimeType = null, 
+        string? mimeType = null, 
         CancellationToken cancellationToken = default);
     
     Task<ImageResizeResult<byte[]>> TryResizeAsync(
         byte[] bytes, 
         ImageResizeArgs resizeArgs, 
-        [CanBeNull] string mimeType = null, 
+        string? mimeType = null, 
         CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs
index 11789776c7..d36a9d6ea0 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs
@@ -23,7 +23,7 @@ public class ImageCompressor : IImageCompressor, ITransientDependency
 
     public virtual async Task<ImageCompressResult<Stream>> CompressAsync(
         [NotNull] Stream stream,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         Check.NotNull(stream, nameof(stream));
@@ -45,7 +45,7 @@ public class ImageCompressor : IImageCompressor, ITransientDependency
 
     public virtual async Task<ImageCompressResult<byte[]>> CompressAsync(
         [NotNull] byte[] bytes,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         Check.NotNull(bytes, nameof(bytes));
diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs
index 139fc194dd..e2c4ad7d77 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs
@@ -31,7 +31,7 @@ public class ImageResizer : IImageResizer, ITransientDependency
     public virtual async Task<ImageResizeResult<Stream>> ResizeAsync(
         [NotNull] Stream stream, 
         ImageResizeArgs resizeArgs, 
-        [CanBeNull] string mimeType = null, 
+        string? mimeType = null, 
         CancellationToken cancellationToken = default)
     {
         Check.NotNull(stream, nameof(stream));
@@ -56,7 +56,7 @@ public class ImageResizer : IImageResizer, ITransientDependency
     public virtual async Task<ImageResizeResult<byte[]>> ResizeAsync(
         [NotNull] byte[] bytes, 
         ImageResizeArgs resizeArgs, 
-        [CanBeNull] string mimeType = null, 
+        string? mimeType = null, 
         CancellationToken cancellationToken = default)
     {
         Check.NotNull(bytes, nameof(bytes));
diff --git a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.csproj b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.csproj
index d727d99a7c..8b8810e000 100644
--- a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.csproj
+++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.csproj
@@ -5,6 +5,8 @@
 
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>Nullable</WarningsAsErrors>
         <PackageId>Volo.Abp.Imaging.AspNetCore</PackageId>
         <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
diff --git a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs
index 1ddd8822be..e49a5abc9f 100644
--- a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs
+++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs
@@ -28,7 +28,7 @@ public class CompressImageAttribute : ActionFilterAttribute
 
         foreach (var (key, value) in parameters)
         {
-            object compressedValue = value switch {
+            object? compressedValue = value switch {
                 IFormFile file => await CompressImageAsync(file, imageCompressor),
                 IRemoteStreamContent remoteStreamContent => await CompressImageAsync(remoteStreamContent, imageCompressor),
                 Stream stream => await CompressImageAsync(stream, imageCompressor),
diff --git a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs
index 799cd81877..65b59bef6f 100644
--- a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs
+++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs
@@ -41,7 +41,7 @@ public class ResizeImageAttribute : ActionFilterAttribute
         
         foreach (var (key, value) in parameters)
         {
-            object resizedValue = value switch {
+            object? resizedValue = value switch {
                 IFormFile file => await ResizeImageAsync(file, imageResizer),
                 IRemoteStreamContent remoteStreamContent => await ResizeImageAsync(remoteStreamContent, imageResizer),
                 Stream stream => await ResizeImageAsync(stream, imageResizer),
diff --git a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Imaging.ImageSharp.csproj b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Imaging.ImageSharp.csproj
index d523a292ba..29d6a3944e 100644
--- a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Imaging.ImageSharp.csproj
+++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Imaging.ImageSharp.csproj
@@ -5,6 +5,8 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;</TargetFrameworks>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>Nullable</WarningsAsErrors>
         <PackageId>Volo.Abp.Imaging.ImageSharp</PackageId>
         <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
diff --git a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs
index a54d006b30..8d2f29dd02 100644
--- a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs
+++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs
@@ -26,7 +26,7 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
 
     public virtual async Task<ImageCompressResult<Stream>> TryCompressAsync(
         Stream stream, 
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         if (!string.IsNullOrWhiteSpace(mimeType) && !CanCompress(mimeType))
@@ -54,7 +54,7 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
 
     public virtual async Task<ImageCompressResult<byte[]>> TryCompressAsync(
         byte[] bytes, 
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         if (!string.IsNullOrWhiteSpace(mimeType) && !CanCompress(mimeType))
@@ -75,7 +75,7 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
         return new ImageCompressResult<byte[]>(newBytes, result.State);
     }
 
-    protected virtual bool CanCompress(string mimeType)
+    protected virtual bool CanCompress(string? mimeType)
     {
         return mimeType switch {
             MimeTypes.Image.Jpeg => true,
diff --git a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs
index d2ac92eaf7..92dbc25034 100644
--- a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs
+++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs
@@ -16,7 +16,7 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran
     public virtual async Task<ImageResizeResult<Stream>> TryResizeAsync(
         Stream stream,
         ImageResizeArgs resizeArgs,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         if (!string.IsNullOrWhiteSpace(mimeType) && !CanResize(mimeType))
@@ -58,7 +58,7 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran
     public virtual async Task<ImageResizeResult<byte[]>> TryResizeAsync(
         byte[] bytes, 
         ImageResizeArgs resizeArgs,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         if (!string.IsNullOrWhiteSpace(mimeType) && !CanResize(mimeType))
@@ -82,7 +82,7 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran
         return new ImageResizeResult<byte[]>(newBytes, result.State);
     }
 
-    protected virtual bool CanResize(string mimeType)
+    protected virtual bool CanResize(string? mimeType)
     {
         return mimeType switch {
             MimeTypes.Image.Jpeg => true,
diff --git a/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj b/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj
index 535f689663..0e3581908a 100644
--- a/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj
+++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj
@@ -5,6 +5,8 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>Nullable</WarningsAsErrors>
         <PackageId>Volo.Abp.Imaging.MagicNet</PackageId>
         <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
diff --git a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs
index a0900cd14a..3aba7f5000 100644
--- a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs
+++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs
@@ -28,7 +28,7 @@ public class MagickImageCompressorContributor : IImageCompressorContributor, ITr
 
     public virtual async Task<ImageCompressResult<Stream>> TryCompressAsync(
         Stream stream, 
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         if (!string.IsNullOrWhiteSpace(mimeType) && !CanCompress(mimeType))
@@ -63,7 +63,7 @@ public class MagickImageCompressorContributor : IImageCompressorContributor, ITr
 
     public virtual async Task<ImageCompressResult<byte[]>> TryCompressAsync(
         byte[] bytes, 
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         if (!string.IsNullOrWhiteSpace(mimeType) && !CanCompress(mimeType))
@@ -86,7 +86,7 @@ public class MagickImageCompressorContributor : IImageCompressorContributor, ITr
         return new ImageCompressResult<byte[]>(newBytes, result.State);
     }
     
-    protected virtual bool CanCompress(string mimeType)
+    protected virtual bool CanCompress(string? mimeType)
     {
         return mimeType switch {
             MimeTypes.Image.Jpeg => true,
diff --git a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs
index 9ffb6133e5..b71230e8bb 100644
--- a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs
+++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs
@@ -16,7 +16,7 @@ public class MagickImageResizerContributor : IImageResizerContributor, ITransien
     public virtual async Task<ImageResizeResult<Stream>> TryResizeAsync(
         Stream stream,
         ImageResizeArgs resizeArgs,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         if (!mimeType.IsNullOrWhiteSpace() && !CanResize(mimeType))
@@ -54,7 +54,7 @@ public class MagickImageResizerContributor : IImageResizerContributor, ITransien
     public virtual Task<ImageResizeResult<byte[]>> TryResizeAsync(
         byte[] bytes,
         ImageResizeArgs resizeArgs,
-        [CanBeNull] string mimeType = null,
+        string? mimeType = null,
         CancellationToken cancellationToken = default)
     {
         if (!mimeType.IsNullOrWhiteSpace() && !CanResize(mimeType))
@@ -74,7 +74,7 @@ public class MagickImageResizerContributor : IImageResizerContributor, ITransien
         return Task.FromResult(new ImageResizeResult<byte[]>(image.ToByteArray(), ImageProcessState.Done));
     }
 
-    protected virtual bool CanResize(string mimeType)
+    protected virtual bool CanResize(string? mimeType)
     {
         return mimeType switch {
             MimeTypes.Image.Jpeg => true,