From 0dfc313b05c91f9b006524d90290f77d82c00d81 Mon Sep 17 00:00:00 2001 From: Alex Soh Date: Sun, 3 Mar 2024 04:57:34 +0800 Subject: [PATCH 1/5] Remove more obsolete exception as stated in #19190 --- .../BackgroundJobExecutionException.cs | 11 ---------- .../BlobStoring/BlobAlreadyExistsException.cs | 7 ------ .../Generic/AbpDictionaryExtensions.cs | 2 +- .../Volo.Abp.Core/Volo/Abp/AbpException.cs | 7 ------ .../Volo/Abp/AbpInitializationException.cs | 7 ------ .../Volo/Abp/AbpShutdownException.cs | 7 ------ .../Volo/Abp/BusinessException.cs | 11 ---------- ...pApplicationWithExternalServiceProvider.cs | 6 ++--- .../Volo/Abp/UserFriendlyException.cs | 11 ---------- .../Abp/Http/Client/AbpRemoteCallException.cs | 8 ------- .../Abp/Minify/NUglify/NUglifyException.cs | 10 --------- .../AbpAuthorizationException.cs | 11 ---------- .../Abp/Validation/AbpValidationException.cs | 12 ---------- .../BlogPostSlugAlreadyExistException.cs | 6 ----- .../Blogs/BlogSlugAlreadyExistException.cs | 10 +-------- .../Comments/EntityNotCommentableException.cs | 13 +---------- .../EntityCantHaveMediaException.cs | 7 +----- .../InvalidMediaDescriptorNameException.cs | 11 +--------- .../CmsKit/Pages/MultipleHomePageException.cs | 22 +++++-------------- .../Pages/PageSlugAlreadyExistsException.cs | 11 +--------- .../Ratings/EntityCantHaveRatingException.cs | 5 ----- .../EntityCantHaveReactionException.cs | 8 +------ .../CmsKit/Tags/EntityNotTaggableException.cs | 9 +------- .../Identity/AbpIdentityResultException.cs | 11 +--------- 24 files changed, 17 insertions(+), 206 deletions(-) diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecutionException.cs b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecutionException.cs index f8c98437dc..905a735e5a 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecutionException.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecutionException.cs @@ -1,9 +1,7 @@ using System; -using System.Runtime.Serialization; namespace Volo.Abp.BackgroundJobs; -[Serializable] public class BackgroundJobExecutionException : AbpException { public string JobType { get; set; } = default!; @@ -15,15 +13,6 @@ public class BackgroundJobExecutionException : AbpException } - /// - /// Creates a new object. - /// - public BackgroundJobExecutionException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } - /// /// Creates a new object. /// diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobAlreadyExistsException.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobAlreadyExistsException.cs index 5eebf40d1c..fee25a22a5 100644 --- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobAlreadyExistsException.cs +++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobAlreadyExistsException.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; namespace Volo.Abp.BlobStoring; @@ -21,10 +20,4 @@ public class BlobAlreadyExistsException : AbpException { } - - public BlobAlreadyExistsException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } } diff --git a/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs b/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs index 61c87864ad..05015b2e24 100644 --- a/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs +++ b/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs @@ -131,7 +131,7 @@ public static class AbpDictionaryExtensions } /// - /// Converts a dictionary to dynamic object so added and removed at run + /// Converts a <string,object> dictionary to dynamic object so added and removed at run /// /// The collection object /// If value is correct, return ExpandoObject that represents an object diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpException.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpException.cs index 906d3a7fcb..22d88140a7 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpException.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpException.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; namespace Volo.Abp; @@ -24,10 +23,4 @@ public class AbpException : Exception { } - - public AbpException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpInitializationException.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpInitializationException.cs index 31e9bc293e..0d7f047626 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpInitializationException.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpInitializationException.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; namespace Volo.Abp; @@ -21,10 +20,4 @@ public class AbpInitializationException : AbpException { } - - public AbpInitializationException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpShutdownException.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpShutdownException.cs index 639190b14d..adbecbfe61 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpShutdownException.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpShutdownException.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; namespace Volo.Abp; @@ -21,10 +20,4 @@ public class AbpShutdownException : AbpException { } - - public AbpShutdownException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/BusinessException.cs b/framework/src/Volo.Abp.Core/Volo/Abp/BusinessException.cs index 268985014f..a7ff48760f 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/BusinessException.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/BusinessException.cs @@ -1,12 +1,10 @@ using System; -using System.Runtime.Serialization; using Microsoft.Extensions.Logging; using Volo.Abp.ExceptionHandling; using Volo.Abp.Logging; namespace Volo.Abp; -[Serializable] public class BusinessException : Exception, IBusinessException, IHasErrorCode, @@ -32,15 +30,6 @@ public class BusinessException : Exception, LogLevel = logLevel; } - /// - /// Constructor for serializing. - /// - public BusinessException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } - public BusinessException WithData(string name, object value) { Data[name] = value; diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs index a17bb146e3..df4c95c7df 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs @@ -10,18 +10,18 @@ public interface IAbpApplicationWithExternalServiceProvider : IAbpApplication /// Sets the service provider, but not initializes the modules. /// void SetServiceProvider([NotNull] IServiceProvider serviceProvider); - + /// /// Sets the service provider and initializes all the modules. /// If was called before, the same - /// instance should be passed to this method. + /// instance should be passed to this method. /// Task InitializeAsync([NotNull] IServiceProvider serviceProvider); /// /// Sets the service provider and initializes all the modules. /// If was called before, the same - /// instance should be passed to this method. + /// instance should be passed to this method. /// void Initialize([NotNull] IServiceProvider serviceProvider); } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/UserFriendlyException.cs b/framework/src/Volo.Abp.Core/Volo/Abp/UserFriendlyException.cs index 83640afd7b..c3bfa57dbb 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/UserFriendlyException.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/UserFriendlyException.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; using Microsoft.Extensions.Logging; namespace Volo.Abp; @@ -7,7 +6,6 @@ namespace Volo.Abp; /// /// This exception type is directly shown to the user. /// -[Serializable] public class UserFriendlyException : BusinessException, IUserFriendlyException { public UserFriendlyException( @@ -25,13 +23,4 @@ public class UserFriendlyException : BusinessException, IUserFriendlyException { Details = details; } - - /// - /// Constructor for serializing. - /// - public UserFriendlyException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } } diff --git a/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/Http/Client/AbpRemoteCallException.cs b/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/Http/Client/AbpRemoteCallException.cs index 887c8fb081..8d511f6d98 100644 --- a/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/Http/Client/AbpRemoteCallException.cs +++ b/framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/Http/Client/AbpRemoteCallException.cs @@ -1,10 +1,8 @@ using System; -using System.Runtime.Serialization; using Volo.Abp.ExceptionHandling; namespace Volo.Abp.Http.Client; -[Serializable] public class AbpRemoteCallException : AbpException, IHasErrorCode, IHasErrorDetails, IHasHttpStatusCode { public int HttpStatusCode { get; set; } @@ -26,12 +24,6 @@ public class AbpRemoteCallException : AbpException, IHasErrorCode, IHasErrorDeta } - public AbpRemoteCallException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } - public AbpRemoteCallException(RemoteServiceErrorInfo error, Exception? innerException = null) : base(error.Message, innerException) { diff --git a/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs index bf623771d3..c98ffb9148 100644 --- a/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; using NUglify; namespace Volo.Abp.Minify.NUglify; @@ -20,13 +19,4 @@ public class NUglifyException : AbpException { } - - /// - /// Constructor for serializing. - /// - public NUglifyException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } } diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Authorization/AbpAuthorizationException.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Authorization/AbpAuthorizationException.cs index 5cae98964c..bfe8079383 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Authorization/AbpAuthorizationException.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Authorization/AbpAuthorizationException.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; using Microsoft.Extensions.Logging; using Volo.Abp.ExceptionHandling; using Volo.Abp.Logging; @@ -9,7 +8,6 @@ namespace Volo.Abp.Authorization; /// /// This exception is thrown on an unauthorized request. /// -[Serializable] public class AbpAuthorizationException : AbpException, IHasLogLevel, IHasErrorCode { /// @@ -31,15 +29,6 @@ public class AbpAuthorizationException : AbpException, IHasLogLevel, IHasErrorCo LogLevel = LogLevel.Warning; } - /// - /// Creates a new object. - /// - public AbpAuthorizationException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } - /// /// Creates a new object. /// diff --git a/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationException.cs b/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationException.cs index aa38ec6d35..c25ace1ac5 100644 --- a/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationException.cs +++ b/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationException.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using System.Runtime.Serialization; using System.Text; using Microsoft.Extensions.Logging; using Volo.Abp.Logging; @@ -12,7 +11,6 @@ namespace Volo.Abp.Validation; /// /// This exception type is used to throws validation exceptions. /// -[Serializable] public class AbpValidationException : AbpException, IHasLogLevel, IHasValidationErrors, @@ -38,16 +36,6 @@ public class AbpValidationException : AbpException, LogLevel = LogLevel.Warning; } - /// - /// Constructor for serializing. - /// - public AbpValidationException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - ValidationErrors = new List(); - LogLevel = LogLevel.Warning; - } - /// /// Constructor. /// diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostSlugAlreadyExistException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostSlugAlreadyExistException.cs index 8e7cacc28c..3ed87739e8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostSlugAlreadyExistException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostSlugAlreadyExistException.cs @@ -1,16 +1,10 @@ using System; -using System.Runtime.Serialization; using Volo.Abp; namespace Volo.CmsKit.Blogs; public class BlogPostSlugAlreadyExistException : BusinessException { - public BlogPostSlugAlreadyExistException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - } - public BlogPostSlugAlreadyExistException(Guid blogId, string slug) { Slug = slug; diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogSlugAlreadyExistException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogSlugAlreadyExistException.cs index 8d14cf469f..ad087eb114 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogSlugAlreadyExistException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogSlugAlreadyExistException.cs @@ -1,10 +1,7 @@ -using System; -using System.Runtime.Serialization; -using Volo.Abp; +using Volo.Abp; namespace Volo.CmsKit.Blogs; -[Serializable] public class BlogSlugAlreadyExistException : BusinessException { public BlogSlugAlreadyExistException(string slug) @@ -12,9 +9,4 @@ public class BlogSlugAlreadyExistException : BusinessException { WithData(nameof(Blog.Slug), slug); } - - public BlogSlugAlreadyExistException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/EntityNotCommentableException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/EntityNotCommentableException.cs index 5f6697704f..bfd2e0ede6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/EntityNotCommentableException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/EntityNotCommentableException.cs @@ -1,20 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; +using Volo.Abp; namespace Volo.CmsKit.Comments; -[Serializable] public class EntityNotCommentableException : BusinessException { - public EntityNotCommentableException(SerializationInfo serializationInfo, StreamingContext context) : base(serializationInfo, context) - { - } - public EntityNotCommentableException(string entityType) { Code = CmsKitErrorCodes.Comments.EntityNotCommentable; diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/EntityCantHaveMediaException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/EntityCantHaveMediaException.cs index 20175b19cd..f7214feef3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/EntityCantHaveMediaException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/EntityCantHaveMediaException.cs @@ -1,14 +1,9 @@ -using System.Runtime.Serialization; -using Volo.Abp; +using Volo.Abp; namespace Volo.CmsKit.MediaDescriptors; public class EntityCantHaveMediaException : BusinessException { - public EntityCantHaveMediaException(SerializationInfo serializationInfo, StreamingContext context) : base(serializationInfo, context) - { - } - public EntityCantHaveMediaException(string entityType) : base(code: CmsKitErrorCodes.MediaDescriptors.EntityTypeDoesntExist) { diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/InvalidMediaDescriptorNameException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/InvalidMediaDescriptorNameException.cs index 4484354159..7b4f87c999 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/InvalidMediaDescriptorNameException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/InvalidMediaDescriptorNameException.cs @@ -1,11 +1,8 @@ -using System; -using System.Runtime.Serialization; -using JetBrains.Annotations; +using JetBrains.Annotations; using Volo.Abp; namespace Volo.CmsKit.MediaDescriptors; -[Serializable] public class InvalidMediaDescriptorNameException : BusinessException { public InvalidMediaDescriptorNameException([NotNull] string name) @@ -13,10 +10,4 @@ public class InvalidMediaDescriptorNameException : BusinessException Code = CmsKitErrorCodes.MediaDescriptors.InvalidName; WithData(nameof(MediaDescriptor.Name), name); } - - public InvalidMediaDescriptorNameException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs index 1cf4028e39..2474b854d6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs @@ -1,23 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; +using Volo.Abp; namespace Volo.CmsKit.Domain.Volo.CmsKit.Pages; -[Serializable] public class MultipleHomePageException : BusinessException { - public MultipleHomePageException() - { - Code = CmsKitErrorCodes.Pages.MultipleHomePage; - } - - public MultipleHomePageException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - } + public MultipleHomePageException() + { + Code = CmsKitErrorCodes.Pages.MultipleHomePage; + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageSlugAlreadyExistsException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageSlugAlreadyExistsException.cs index 8b8c8d924d..78a311838e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageSlugAlreadyExistsException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageSlugAlreadyExistsException.cs @@ -1,11 +1,8 @@ -using System; -using System.Runtime.Serialization; -using JetBrains.Annotations; +using JetBrains.Annotations; using Volo.Abp; namespace Volo.CmsKit.Pages; -[Serializable] public class PageSlugAlreadyExistsException : BusinessException { public PageSlugAlreadyExistsException([NotNull] string slug) @@ -13,10 +10,4 @@ public class PageSlugAlreadyExistsException : BusinessException Code = CmsKitErrorCodes.Pages.SlugAlreadyExist; WithData(nameof(Page.Slug), slug); } - - public PageSlugAlreadyExistsException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/EntityCantHaveRatingException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/EntityCantHaveRatingException.cs index fde7c0d438..1ed83e1e51 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/EntityCantHaveRatingException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/EntityCantHaveRatingException.cs @@ -1,15 +1,10 @@ using JetBrains.Annotations; -using System.Runtime.Serialization; using Volo.Abp; namespace Volo.CmsKit.Ratings; public class EntityCantHaveRatingException : BusinessException { - public EntityCantHaveRatingException(SerializationInfo serializationInfo, StreamingContext context) : base(serializationInfo, context) - { - } - public EntityCantHaveRatingException([NotNull] string entityType) { Code = CmsKitErrorCodes.Ratings.EntityCantHaveRating; diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/EntityCantHaveReactionException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/EntityCantHaveReactionException.cs index 217c3115f7..1a7771c715 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/EntityCantHaveReactionException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/EntityCantHaveReactionException.cs @@ -1,16 +1,10 @@ - -using JetBrains.Annotations; -using System.Runtime.Serialization; +using JetBrains.Annotations; using Volo.Abp; namespace Volo.CmsKit.Reactions; public class EntityCantHaveReactionException : BusinessException { - public EntityCantHaveReactionException(SerializationInfo serializationInfo, StreamingContext context) : base(serializationInfo, context) - { - } - public EntityCantHaveReactionException([NotNull] string entityType) { EntityType = Check.NotNullOrEmpty(entityType, nameof(entityType)); diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityNotTaggableException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityNotTaggableException.cs index f506804d2f..2654a010dd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityNotTaggableException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityNotTaggableException.cs @@ -1,16 +1,9 @@ -using System; -using System.Runtime.Serialization; -using Volo.Abp; +using Volo.Abp; namespace Volo.CmsKit.Tags; -[Serializable] public class EntityNotTaggableException : BusinessException { - public EntityNotTaggableException(SerializationInfo serializationInfo, StreamingContext context) : base(serializationInfo, context) - { - } - public EntityNotTaggableException(string entityType) { Code = CmsKitErrorCodes.Tags.EntityNotTaggable; diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs index 458f420411..03a8c6f881 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Runtime.Serialization; using JetBrains.Annotations; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Localization; @@ -11,7 +9,6 @@ using Volo.Abp.Localization; namespace Volo.Abp.Identity; -[Serializable] public class AbpIdentityResultException : BusinessException, ILocalizeErrorMessage { public IdentityResult IdentityResult { get; } @@ -24,12 +21,6 @@ public class AbpIdentityResultException : BusinessException, ILocalizeErrorMessa IdentityResult = Check.NotNull(identityResult, nameof(identityResult)); } - public AbpIdentityResultException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } - public virtual string LocalizeMessage(LocalizationContext context) { var localizer = context.LocalizerFactory.Create(); From e0269fcb8982387b95a6dc94178fa0df00b1bb78 Mon Sep 17 00:00:00 2001 From: Alex Soh Date: Sun, 3 Mar 2024 20:03:59 +0800 Subject: [PATCH 2/5] Revert the default ctor for MultipleHomePageException. Signed-off-by: Alex Soh --- .../Volo/CmsKit/Pages/MultipleHomePageException.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs index 2474b854d6..734445a441 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs @@ -2,10 +2,11 @@ namespace Volo.CmsKit.Domain.Volo.CmsKit.Pages; +[Serializable] public class MultipleHomePageException : BusinessException { - public MultipleHomePageException() - { - Code = CmsKitErrorCodes.Pages.MultipleHomePage; - } + public MultipleHomePageException() + { + Code = CmsKitErrorCodes.Pages.MultipleHomePage; + } } From 7505e7ecafbebf67272c39d987ee5ddb24173143 Mon Sep 17 00:00:00 2001 From: Alex Soh Date: Mon, 4 Mar 2024 11:48:56 +0800 Subject: [PATCH 3/5] Fix build issue error for MultipleHomePageException class where it was reverted partially but forgot to remove the Serializable attribute --- .../Volo/CmsKit/Pages/MultipleHomePageException.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs index 734445a441..320dc357e9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs @@ -2,7 +2,6 @@ namespace Volo.CmsKit.Domain.Volo.CmsKit.Pages; -[Serializable] public class MultipleHomePageException : BusinessException { public MultipleHomePageException() From dabb6c2f5c585c9afed7848593d9f974fabf1c26 Mon Sep 17 00:00:00 2001 From: Alex Soh Date: Mon, 4 Mar 2024 13:19:56 +0800 Subject: [PATCH 4/5] Fix build issues with Volo.Docs project exceptions --- .../Volo/Docs/DocumentNotFoundException.cs | 11 +---------- .../Volo/Docs/ResourceNotFoundException.cs | 11 +---------- .../Volo/Docs/Documents/DocsDocumentController.cs | 1 + .../Volo/Docs/Projects/DocsProjectController.cs | 1 + .../Areas/Documents/DocumentResourceController.cs | 1 + 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/DocumentNotFoundException.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/DocumentNotFoundException.cs index aa7bafd284..a2f50e8f22 100644 --- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/DocumentNotFoundException.cs +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/DocumentNotFoundException.cs @@ -1,20 +1,11 @@ -using System; -using System.Runtime.Serialization; -using Volo.Abp; +using Volo.Abp; namespace Volo.Docs { - [Serializable] public class DocumentNotFoundException : BusinessException { public string DocumentUrl { get; set; } - public DocumentNotFoundException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } - public DocumentNotFoundException(string documentUrl) { DocumentUrl = documentUrl; diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/ResourceNotFoundException.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/ResourceNotFoundException.cs index 6feff9c5cd..0f156edc47 100644 --- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/ResourceNotFoundException.cs +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/ResourceNotFoundException.cs @@ -1,20 +1,11 @@ -using System; -using System.Runtime.Serialization; -using Volo.Abp; +using Volo.Abp; namespace Volo.Docs { - [Serializable] public class ResourceNotFoundException : BusinessException { public string ResourceName { get; set; } - public ResourceNotFoundException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } - public ResourceNotFoundException(string resourceName) { ResourceName = resourceName; diff --git a/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Documents/DocsDocumentController.cs b/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Documents/DocsDocumentController.cs index 45a5cdf515..71a1d83b4c 100644 --- a/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Documents/DocsDocumentController.cs +++ b/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Documents/DocsDocumentController.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Asp.Versioning; using Volo.Abp; diff --git a/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs b/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs index 1cc1f80cc8..3a23d379ef 100644 --- a/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs +++ b/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Asp.Versioning; using Volo.Abp; diff --git a/modules/docs/src/Volo.Docs.Web/Areas/Documents/DocumentResourceController.cs b/modules/docs/src/Volo.Docs.Web/Areas/Documents/DocumentResourceController.cs index 3e21bab9c7..976782bfce 100644 --- a/modules/docs/src/Volo.Docs.Web/Areas/Documents/DocumentResourceController.cs +++ b/modules/docs/src/Volo.Docs.Web/Areas/Documents/DocumentResourceController.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Asp.Versioning; using Volo.Abp; From c56a5f9d1caefabd28561c8e83a8ea06a09d89a2 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 5 Mar 2024 10:11:28 +0800 Subject: [PATCH 5/5] Fix unit test. --- .../ImageSharpImageCompressor_Tests.cs | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs index 6c7041ab2e..ec273036fb 100644 --- a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs +++ b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs @@ -1,6 +1,9 @@ using System.IO; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Shouldly; +using SixLabors.ImageSharp.Formats.Jpeg; +using SixLabors.ImageSharp.Formats.Webp; using Xunit; namespace Volo.Abp.Imaging; @@ -8,10 +11,29 @@ namespace Volo.Abp.Imaging; public class ImageSharpImageCompressor_Tests : AbpImagingImageSharpTestBase { public IImageCompressor ImageCompressor { get; } + public ImageSharpImageCompressor_Tests() { ImageCompressor = GetRequiredService(); } + + protected override void AfterAddApplication(IServiceCollection services) + { + services.Configure(options => + { + options.JpegEncoder = new JpegEncoder + { + Quality = 50 + }; + options.WebpEncoder = new WebpEncoder + { + Quality = 50 + }; + }); + + base.AfterAddApplication(services); + } + [Fact] public async Task Should_Compress_Jpg() { @@ -59,21 +81,21 @@ public class ImageSharpImageCompressor_Tests : AbpImagingImageSharpTestBase { await using var jpegImage = ImageFileHelper.GetJpgTestFileStream(); var byteArr = await jpegImage.GetAllBytesAsync(); - + var compressedImage1 = await ImageCompressor.CompressAsync(jpegImage); var compressedImage2 = await ImageCompressor.CompressAsync(byteArr); - + compressedImage1.ShouldNotBeNull(); compressedImage1.State.ShouldBe(ImageProcessState.Done); - + compressedImage2.ShouldNotBeNull(); compressedImage2.State.ShouldBe(ImageProcessState.Done); - + compressedImage1.Result.Length.ShouldBeLessThan(jpegImage.Length); compressedImage2.Result.LongLength.ShouldBeLessThan(jpegImage.Length); - + compressedImage1.Result.Length.ShouldBe(compressedImage2.Result.LongLength); - + compressedImage1.Result.Dispose(); } -} \ No newline at end of file +}