Browse Source

Replace ApplicationConfigurationBuilder by AbpApplicationConfigurationAppService

pull/732/head
Halil ibrahim Kalkan 7 years ago
parent
commit
fbc4428b2b
  1. 20
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
  2. 11
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs
  3. 8
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationScriptController.cs
  4. 3
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IAbpApplicationConfigurationAppService.cs
  5. 2
      framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder_Tests.cs

20
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder.cs → framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs

@ -1,24 +1,24 @@
using System; using Microsoft.AspNetCore.Authorization;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Volo.Abp.Application.Services;
using Volo.Abp.Authorization; using Volo.Abp.Authorization;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Localization; using Volo.Abp.Localization;
namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
{ {
public class ApplicationConfigurationBuilder : IApplicationConfigurationBuilder, ITransientDependency public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApplicationConfigurationAppService
{ {
private readonly AbpLocalizationOptions _localizationOptions; private readonly AbpLocalizationOptions _localizationOptions;
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
private readonly IAbpAuthorizationPolicyProvider _abpAuthorizationPolicyProvider; private readonly IAbpAuthorizationPolicyProvider _abpAuthorizationPolicyProvider;
private readonly IAuthorizationService _authorizationService; private readonly IAuthorizationService _authorizationService;
public ApplicationConfigurationBuilder( public AbpApplicationConfigurationAppService(
IOptions<AbpLocalizationOptions> localizationOptions, IOptions<AbpLocalizationOptions> localizationOptions,
IServiceProvider serviceProvider, IServiceProvider serviceProvider,
IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider, IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider,
@ -30,7 +30,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
_localizationOptions = localizationOptions.Value; _localizationOptions = localizationOptions.Value;
} }
public async Task<ApplicationConfigurationDto> GetAsync() //TODO: Test, at least with a simple Get public async Task<ApplicationConfigurationDto> GetAsync()
{ {
//TODO: Optimize & cache..? //TODO: Optimize & cache..?
@ -66,7 +66,9 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
{ {
var dictionary = new Dictionary<string, string>(); var dictionary = new Dictionary<string, string>();
var localizer = _serviceProvider.GetRequiredService(typeof(IStringLocalizer<>).MakeGenericType(resource.ResourceType)) as IStringLocalizer; var localizer = _serviceProvider.GetRequiredService(
typeof(IStringLocalizer<>).MakeGenericType(resource.ResourceType)
) as IStringLocalizer;
foreach (var localizedString in localizer.GetAllStrings()) foreach (var localizedString in localizer.GetAllStrings())
{ {

11
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs

@ -6,17 +6,18 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
[Route("api/abp/application-configuration")] [Route("api/abp/application-configuration")]
public class AbpApplicationConfigurationController : AbpController public class AbpApplicationConfigurationController : AbpController
{ {
private readonly IApplicationConfigurationBuilder _configurationBuilder; private readonly IAbpApplicationConfigurationAppService _applicationConfigurationAppService;
public AbpApplicationConfigurationController(IApplicationConfigurationBuilder configurationBuilder) public AbpApplicationConfigurationController(
IAbpApplicationConfigurationAppService applicationConfigurationAppService)
{ {
_configurationBuilder = configurationBuilder; _applicationConfigurationAppService = applicationConfigurationAppService;
} }
[HttpGet] [HttpGet]
public Task<ApplicationConfigurationDto> Get() public Task<ApplicationConfigurationDto> GetAsync()
{ {
return _configurationBuilder.GetAsync(); return _applicationConfigurationAppService.GetAsync();
} }
} }
} }

8
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationScriptController.cs

@ -12,14 +12,14 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
[DisableAuditing] [DisableAuditing]
public class AbpApplicationConfigurationScriptController : AbpController public class AbpApplicationConfigurationScriptController : AbpController
{ {
private readonly IApplicationConfigurationBuilder _configurationBuilder; private readonly IAbpApplicationConfigurationAppService _configurationAppService;
private readonly IJsonSerializer _jsonSerializer; private readonly IJsonSerializer _jsonSerializer;
public AbpApplicationConfigurationScriptController( public AbpApplicationConfigurationScriptController(
IApplicationConfigurationBuilder configurationBuilder, IAbpApplicationConfigurationAppService configurationAppService,
IJsonSerializer jsonSerializer) IJsonSerializer jsonSerializer)
{ {
_configurationBuilder = configurationBuilder; _configurationAppService = configurationAppService;
_jsonSerializer = jsonSerializer; _jsonSerializer = jsonSerializer;
} }
@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
public async Task<string> Get() public async Task<string> Get()
{ {
return CreateAbpExtendScript( return CreateAbpExtendScript(
await _configurationBuilder.GetAsync() await _configurationAppService.GetAsync()
); );
} }

3
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IApplicationConfigurationBuilder.cs → framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IAbpApplicationConfigurationAppService.cs

@ -1,8 +1,9 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Application.Services;
namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
{ {
public interface IApplicationConfigurationBuilder public interface IAbpApplicationConfigurationAppService : IApplicationService
{ {
Task<ApplicationConfigurationDto> GetAsync(); Task<ApplicationConfigurationDto> GetAsync();
} }

2
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder_Tests.cs

@ -9,7 +9,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
[Fact] [Fact]
public async Task ApplicationConfigurationBuilder_GetAsync() public async Task ApplicationConfigurationBuilder_GetAsync()
{ {
var applicationConfigurationBuilder = GetRequiredService<IApplicationConfigurationBuilder>(); var applicationConfigurationBuilder = GetRequiredService<IAbpApplicationConfigurationAppService>();
var config = await applicationConfigurationBuilder.GetAsync(); var config = await applicationConfigurationBuilder.GetAsync();

Loading…
Cancel
Save