From f9e97319fb94d6210fa06fbe52cb6b86498812fd Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:41:03 +0300 Subject: [PATCH] ExceptionLocalizationOptions to AbpExceptionLocalizationOptions --- .../AbpIoLocalization/AbpIoLocalizationModule.cs | 2 +- .../ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs | 4 ++-- ...alizationOptions.cs => AbpExceptionLocalizationOptions.cs} | 4 ++-- .../Volo/Abp/Account/AbpAccountApplicationContractsModule.cs | 2 +- .../Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs | 2 +- .../Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs | 2 +- .../Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs | 2 +- .../BookManagementDomainSharedModule.cs | 2 +- .../ProductManagement/ProductManagementDomainModule.cs | 2 +- .../MyProjectNameDomainSharedModule.cs | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/{ExceptionLocalizationOptions.cs => AbpExceptionLocalizationOptions.cs} (82%) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs b/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs index d32497b394..19c707bfad 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs @@ -24,7 +24,7 @@ namespace AbpIoLocalization options.FileSets.AddEmbedded("AbpIoLocalization"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("Volo.AbpIo.Commercial", typeof(AbpIoCommercialResource)); options.MapCodeNamespace("Volo.AbpIo.Domain", typeof(AbpIoBaseResource)); diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs index d1ae5dd59a..5bf59b0cc9 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs @@ -21,13 +21,13 @@ namespace Volo.Abp.AspNetCore.ExceptionHandling { public bool SendAllExceptionsToClients { get; set; } = false; - protected ExceptionLocalizationOptions LocalizationOptions { get; } + protected AbpExceptionLocalizationOptions LocalizationOptions { get; } protected IStringLocalizerFactory StringLocalizerFactory { get; } protected IStringLocalizer L { get; } protected IServiceProvider ServiceProvider { get; } public DefaultExceptionToErrorInfoConverter( - IOptions localizationOptions, + IOptions localizationOptions, IStringLocalizerFactory stringLocalizerFactory, IStringLocalizer abpUiStringLocalizer, IServiceProvider serviceProvider) diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/ExceptionLocalizationOptions.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/AbpExceptionLocalizationOptions.cs similarity index 82% rename from framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/ExceptionLocalizationOptions.cs rename to framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/AbpExceptionLocalizationOptions.cs index 1105b7146c..9fd7f5dd62 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/ExceptionLocalizationOptions.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/AbpExceptionLocalizationOptions.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; namespace Volo.Abp.Localization.ExceptionHandling { - public class ExceptionLocalizationOptions + public class AbpExceptionLocalizationOptions { public Dictionary ErrorCodeNamespaceMappings { get; } - public ExceptionLocalizationOptions() + public AbpExceptionLocalizationOptions() { ErrorCodeNamespaceMappings = new Dictionary(); } diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs index a14a2bce0c..1d3ced4cdb 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.Account .AddVirtualJson("/Volo/Abp/Account/Localization/Resources"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("Volo.Account", typeof(AccountResource)); }); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs index 22b845eeaa..e8e961d3b4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.FeatureManagement options.ProviderPolicies[TenantFeatureValueProvider.ProviderName] = "AbpTenantManagement.Tenants.ManageFeatures"; }); - Configure(options => + Configure(options => { options.MapCodeNamespace("AbpFeatureManagement", typeof(AbpFeatureManagementResource)); }); diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs index bdbf5dacb6..5133e0dc03 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.Identity ).AddVirtualJson("/Volo/Abp/Identity/Localization"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("Volo.Abp.Identity", typeof(IdentityResource)); }); diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs index 5cd92d8083..983ffcb071 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.IdentityServer ).AddVirtualJson("/Volo/Abp/IdentityServer/Localization/Resources"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("Volo.IdentityServer", typeof(AbpIdentityServerResource)); }); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs index b64b359004..7e56eb6f18 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs @@ -27,7 +27,7 @@ namespace Acme.BookStore.BookManagement .AddVirtualJson("/Localization/BookManagement"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("BookManagement", typeof(BookManagementResource)); }); diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs index c1f4aebf55..85505815dc 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs @@ -28,7 +28,7 @@ namespace ProductManagement options.Resources.Get().AddVirtualJson("/ProductManagement/Localization/Domain"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("ProductManagement", typeof(ProductManagementResource)); }); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index 18d257c65b..2d22b07cdf 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -27,7 +27,7 @@ namespace MyCompanyName.MyProjectName .AddVirtualJson("/Localization/MyProjectName"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("MyProjectName", typeof(MyProjectNameResource)); });