From aea32b581917bcad0818c19d497858a1a8280fa6 Mon Sep 17 00:00:00 2001 From: Iliyan Iliev Date: Mon, 11 May 2020 13:59:02 +0300 Subject: [PATCH 1/2] Closes #8 --- .../AutofacExtension.cs | 6 +++--- .../ISmsProviderInfobipApi.cs | 2 +- .../ISmsProviderInfobipClient.cs | 2 +- .../MAVN.Service.SmsProviderInfobip.Client.csproj | 1 - .../SmsProviderInfobipClient.cs | 2 +- .../SmsProviderInfobipServiceClientSettings.cs | 2 +- .../IInfobip.cs | 6 +++--- .../IInfobipClient.cs | 2 +- .../InfobipClient.cs | 8 +++----- .../AuthorizationHeaderHttpClientHandler.cs | 2 +- .../Models/Requests/SendSmsRequestModel.cs | 2 +- .../Models/Responses/SmsResponseDetailsModel.cs | 2 +- .../Models/Responses/SmsResponseModel.cs | 2 +- .../Models/Responses/StatusResponseModel.cs | 2 +- .../MAVN.Service.SmsProviderInfobip.Domain.csproj | 5 +++-- .../Services/ISmsService.cs | 7 ++++--- ...ervice.SmsProviderInfobip.DomainServices.csproj | 6 ++++-- .../Services/SmsService.cs | 14 +++++++------- .../Controllers/InfobipSmsController.cs | 10 +++++----- .../Modules/ServiceModule.cs | 10 +++++----- src/MAVN.Service.SmsProviderInfobip/Program.cs | 4 ++-- .../Settings/AppSettings.cs | 2 +- .../Settings/DbSettings.cs | 2 +- .../Settings/InfobipSettings.cs | 2 +- .../Settings/SmsProviderInfobipSettings.cs | 2 +- src/MAVN.Service.SmsProviderInfobip/Startup.cs | 6 +++--- .../Validation/SendSmsRequestModelValidator.cs | 6 +++--- .../ClientHttpPathsAreMatchedInControllersTest.cs | 4 ++-- .../SmsServiceTests.cs | 10 +++++----- 29 files changed, 66 insertions(+), 65 deletions(-) diff --git a/client/MAVN.Service.SmsProviderInfobip.Client/AutofacExtension.cs b/client/MAVN.Service.SmsProviderInfobip.Client/AutofacExtension.cs index aa04476..dd0e1e7 100644 --- a/client/MAVN.Service.SmsProviderInfobip.Client/AutofacExtension.cs +++ b/client/MAVN.Service.SmsProviderInfobip.Client/AutofacExtension.cs @@ -1,10 +1,10 @@ +using System; using Autofac; using JetBrains.Annotations; using Lykke.HttpClientGenerator; using Lykke.HttpClientGenerator.Infrastructure; -using System; -namespace Lykke.Service.SmsProviderInfobip.Client +namespace MAVN.Service.SmsProviderInfobip.Client { /// /// Extension for client registration @@ -30,7 +30,7 @@ public static void RegisterSmsProviderInfobipClient( if (string.IsNullOrWhiteSpace(settings.ServiceUrl)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(SmsProviderInfobipServiceClientSettings.ServiceUrl)); - var clientBuilder = HttpClientGenerator.HttpClientGenerator.BuildForUrl(settings.ServiceUrl) + var clientBuilder = Lykke.HttpClientGenerator.HttpClientGenerator.BuildForUrl(settings.ServiceUrl) .WithAdditionalCallsWrapper(new ExceptionHandlerCallsWrapper()); clientBuilder = builderConfigure?.Invoke(clientBuilder) ?? clientBuilder.WithoutRetries(); diff --git a/client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipApi.cs b/client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipApi.cs index 2c6def2..86955b3 100644 --- a/client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipApi.cs +++ b/client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipApi.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace Lykke.Service.SmsProviderInfobip.Client +namespace MAVN.Service.SmsProviderInfobip.Client { /// /// SmsProviderInfobip client API interface. diff --git a/client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipClient.cs b/client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipClient.cs index 54624c0..b7713a1 100644 --- a/client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipClient.cs +++ b/client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipClient.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace Lykke.Service.SmsProviderInfobip.Client +namespace MAVN.Service.SmsProviderInfobip.Client { /// /// SmsProviderInfobip client interface. diff --git a/client/MAVN.Service.SmsProviderInfobip.Client/MAVN.Service.SmsProviderInfobip.Client.csproj b/client/MAVN.Service.SmsProviderInfobip.Client/MAVN.Service.SmsProviderInfobip.Client.csproj index 56a9f07..c44896c 100644 --- a/client/MAVN.Service.SmsProviderInfobip.Client/MAVN.Service.SmsProviderInfobip.Client.csproj +++ b/client/MAVN.Service.SmsProviderInfobip.Client/MAVN.Service.SmsProviderInfobip.Client.csproj @@ -14,7 +14,6 @@ - diff --git a/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipClient.cs b/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipClient.cs index 0d30528..bd04dae 100644 --- a/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipClient.cs +++ b/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipClient.cs @@ -1,6 +1,6 @@ using Lykke.HttpClientGenerator; -namespace Lykke.Service.SmsProviderInfobip.Client +namespace MAVN.Service.SmsProviderInfobip.Client { /// /// SmsProviderInfobip API aggregating interface. diff --git a/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs b/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs index fbb9735..4676ed3 100644 --- a/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs +++ b/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs @@ -1,6 +1,6 @@ using Lykke.SettingsReader.Attributes; -namespace Lykke.Service.SmsProviderInfobip.Client +namespace MAVN.Service.SmsProviderInfobip.Client { /// /// SmsProviderInfobip client settings. diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobip.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobip.cs index af74381..49d8720 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobip.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobip.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; -using Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Requests; -using Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Responses; +using MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Requests; +using MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Responses; using Refit; -namespace Lykke.Service.SmsProviderInfobip.InfobipClient +namespace MAVN.Service.SmsProviderInfobip.InfobipClient { /// /// Interface that describes Infobip SMS client access diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobipClient.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobipClient.cs index cd402ce..01a9267 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobipClient.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobipClient.cs @@ -1,4 +1,4 @@ -namespace Lykke.Service.SmsProviderInfobip.InfobipClient +namespace MAVN.Service.SmsProviderInfobip.InfobipClient { /// /// Infobip API client diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/InfobipClient.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/InfobipClient.cs index 1a34f6d..e99cb95 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/InfobipClient.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/InfobipClient.cs @@ -1,9 +1,7 @@ -using System; using Lykke.HttpClientGenerator.Infrastructure; -using Lykke.HttpClientGenerator.Retries; -using Lykke.Service.SmsProviderInfobip.InfobipClient.Infrastructure; +using MAVN.Service.SmsProviderInfobip.InfobipClient.Infrastructure; -namespace Lykke.Service.SmsProviderInfobip.InfobipClient +namespace MAVN.Service.SmsProviderInfobip.InfobipClient { /// /// Infobip API client @@ -71,7 +69,7 @@ public InfobipClient(string serviceUrl, int timeoutMs, int retries, string infob private void InitializeClient() { - var clientBuilder = HttpClientGenerator.HttpClientGenerator.BuildForUrl(ServiceUrl) + var clientBuilder = Lykke.HttpClientGenerator.HttpClientGenerator.BuildForUrl(ServiceUrl) .WithAdditionalCallsWrapper(new ExceptionHandlerCallsWrapper()) .WithoutRetries() .WithAdditionalDelegatingHandler( diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Infrastructure/AuthorizationHeaderHttpClientHandler.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Infrastructure/AuthorizationHeaderHttpClientHandler.cs index 1bd5bac..6723cee 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Infrastructure/AuthorizationHeaderHttpClientHandler.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Infrastructure/AuthorizationHeaderHttpClientHandler.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Lykke.Service.SmsProviderInfobip.InfobipClient.Infrastructure +namespace MAVN.Service.SmsProviderInfobip.InfobipClient.Infrastructure { public class AuthorizationHeaderHttpClientHandler : DelegatingHandler { diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs index 9acfddf..57483d3 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Requests +namespace MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Requests { /// /// Model used to send SMS diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/SmsResponseDetailsModel.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/SmsResponseDetailsModel.cs index 3b9da5a..33bb637 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/SmsResponseDetailsModel.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/SmsResponseDetailsModel.cs @@ -1,4 +1,4 @@ -namespace Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Responses +namespace MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Responses { /// /// Model that represents SMS response details diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/SmsResponseModel.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/SmsResponseModel.cs index 5ec826c..5ae287c 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/SmsResponseModel.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/SmsResponseModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Responses +namespace MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Responses { /// /// Model that represents SMS response diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/StatusResponseModel.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/StatusResponseModel.cs index 5a6aca8..ffe8743 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/StatusResponseModel.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Responses/StatusResponseModel.cs @@ -1,4 +1,4 @@ -namespace Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Responses +namespace MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Responses { /// /// Model that represents status response diff --git a/src/MAVN.Service.SmsProviderInfobip.Domain/MAVN.Service.SmsProviderInfobip.Domain.csproj b/src/MAVN.Service.SmsProviderInfobip.Domain/MAVN.Service.SmsProviderInfobip.Domain.csproj index 1e93d55..98da8b9 100644 --- a/src/MAVN.Service.SmsProviderInfobip.Domain/MAVN.Service.SmsProviderInfobip.Domain.csproj +++ b/src/MAVN.Service.SmsProviderInfobip.Domain/MAVN.Service.SmsProviderInfobip.Domain.csproj @@ -4,8 +4,9 @@ 1.0.0 - - + + + diff --git a/src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs b/src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs index 416d5a1..754f596 100644 --- a/src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs +++ b/src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs @@ -1,8 +1,9 @@ -using Lykke.Service.NotificationSystemBroker.SmsProviderClient; +using MAVN.Service.NotificationSystemBroker.SmsProviderClient; -namespace Lykke.Service.SmsProviderInfobip.Domain.Services +namespace MAVN.Service.SmsProviderInfobip.Domain.Services { - public interface ISmsService : ISmsProvider + public interface ISmsService : ISmsProviderApi + { } } diff --git a/src/MAVN.Service.SmsProviderInfobip.DomainServices/MAVN.Service.SmsProviderInfobip.DomainServices.csproj b/src/MAVN.Service.SmsProviderInfobip.DomainServices/MAVN.Service.SmsProviderInfobip.DomainServices.csproj index 1ff7a7f..a42292f 100644 --- a/src/MAVN.Service.SmsProviderInfobip.DomainServices/MAVN.Service.SmsProviderInfobip.DomainServices.csproj +++ b/src/MAVN.Service.SmsProviderInfobip.DomainServices/MAVN.Service.SmsProviderInfobip.DomainServices.csproj @@ -1,11 +1,13 @@ - + netcoreapp2.2 1.0.0 - + + + diff --git a/src/MAVN.Service.SmsProviderInfobip.DomainServices/Services/SmsService.cs b/src/MAVN.Service.SmsProviderInfobip.DomainServices/Services/SmsService.cs index e99d2d3..78fc965 100644 --- a/src/MAVN.Service.SmsProviderInfobip.DomainServices/Services/SmsService.cs +++ b/src/MAVN.Service.SmsProviderInfobip.DomainServices/Services/SmsService.cs @@ -1,15 +1,15 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; using Common.Log; using Lykke.Common.Log; -using Lykke.Service.NotificationSystemBroker.SmsProviderClient; -using Lykke.Service.NotificationSystemBroker.SmsProviderClient.Enums; -using Lykke.Service.SmsProviderInfobip.Domain.Services; -using Lykke.Service.SmsProviderInfobip.InfobipClient; -using SendSmsRequestModel = Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Requests.SendSmsRequestModel; +using MAVN.Service.NotificationSystemBroker.SmsProviderClient; +using MAVN.Service.NotificationSystemBroker.SmsProviderClient.Enums; +using MAVN.Service.SmsProviderInfobip.Domain.Services; +using MAVN.Service.SmsProviderInfobip.InfobipClient; +using SendSmsRequestModel = MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Requests.SendSmsRequestModel; -namespace Lykke.Service.SmsProviderInfobip.DomainServices.Services +namespace MAVN.Service.SmsProviderInfobip.DomainServices.Services { public class SmsService : ISmsService { diff --git a/src/MAVN.Service.SmsProviderInfobip/Controllers/InfobipSmsController.cs b/src/MAVN.Service.SmsProviderInfobip/Controllers/InfobipSmsController.cs index 0d4d8f6..fbbf5ea 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Controllers/InfobipSmsController.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Controllers/InfobipSmsController.cs @@ -1,14 +1,14 @@ -using System.Net; +using System.Net; using System.Threading.Tasks; -using Lykke.Service.NotificationSystemBroker.SmsProviderClient; -using Lykke.Service.SmsProviderInfobip.Domain.Services; +using MAVN.Service.NotificationSystemBroker.SmsProviderClient; +using MAVN.Service.SmsProviderInfobip.Domain.Services; using Microsoft.AspNetCore.Mvc; -namespace Lykke.Service.SmsProviderInfobip.Controllers +namespace MAVN.Service.SmsProviderInfobip.Controllers { [Route("/api/")] [ApiController] - public class InfobipSmsController : Controller, ISmsProvider + public class InfobipSmsController : Controller, ISmsProviderApi { private readonly ISmsService _smsService; diff --git a/src/MAVN.Service.SmsProviderInfobip/Modules/ServiceModule.cs b/src/MAVN.Service.SmsProviderInfobip/Modules/ServiceModule.cs index 1c8286e..bde25bd 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Modules/ServiceModule.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Modules/ServiceModule.cs @@ -1,11 +1,11 @@ using Autofac; -using Lykke.Service.SmsProviderInfobip.Domain.Services; -using Lykke.Service.SmsProviderInfobip.DomainServices.Services; -using Lykke.Service.SmsProviderInfobip.InfobipClient; -using Lykke.Service.SmsProviderInfobip.Settings; using Lykke.SettingsReader; +using MAVN.Service.SmsProviderInfobip.Domain.Services; +using MAVN.Service.SmsProviderInfobip.DomainServices.Services; +using MAVN.Service.SmsProviderInfobip.InfobipClient; +using MAVN.Service.SmsProviderInfobip.Settings; -namespace Lykke.Service.SmsProviderInfobip.Modules +namespace MAVN.Service.SmsProviderInfobip.Modules { public class ServiceModule : Module { diff --git a/src/MAVN.Service.SmsProviderInfobip/Program.cs b/src/MAVN.Service.SmsProviderInfobip/Program.cs index 7f2c6d1..eada705 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Program.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Program.cs @@ -1,7 +1,7 @@ -using Lykke.Sdk; using System.Threading.Tasks; +using Lykke.Sdk; -namespace Lykke.Service.SmsProviderInfobip +namespace MAVN.Service.SmsProviderInfobip { internal sealed class Program { diff --git a/src/MAVN.Service.SmsProviderInfobip/Settings/AppSettings.cs b/src/MAVN.Service.SmsProviderInfobip/Settings/AppSettings.cs index 11460d1..5ce6ca6 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Settings/AppSettings.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Settings/AppSettings.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Lykke.Sdk.Settings; -namespace Lykke.Service.SmsProviderInfobip.Settings +namespace MAVN.Service.SmsProviderInfobip.Settings { [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)] public class AppSettings : BaseAppSettings diff --git a/src/MAVN.Service.SmsProviderInfobip/Settings/DbSettings.cs b/src/MAVN.Service.SmsProviderInfobip/Settings/DbSettings.cs index 28d6b53..56154ab 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Settings/DbSettings.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Settings/DbSettings.cs @@ -1,6 +1,6 @@ using Lykke.SettingsReader.Attributes; -namespace Lykke.Service.SmsProviderInfobip.Settings +namespace MAVN.Service.SmsProviderInfobip.Settings { public class DbSettings { diff --git a/src/MAVN.Service.SmsProviderInfobip/Settings/InfobipSettings.cs b/src/MAVN.Service.SmsProviderInfobip/Settings/InfobipSettings.cs index a40ab2a..936d4c2 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Settings/InfobipSettings.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Settings/InfobipSettings.cs @@ -1,4 +1,4 @@ -namespace Lykke.Service.SmsProviderInfobip.Settings +namespace MAVN.Service.SmsProviderInfobip.Settings { public class InfobipSettings { diff --git a/src/MAVN.Service.SmsProviderInfobip/Settings/SmsProviderInfobipSettings.cs b/src/MAVN.Service.SmsProviderInfobip/Settings/SmsProviderInfobipSettings.cs index 3f5af7b..cb89841 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Settings/SmsProviderInfobipSettings.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Settings/SmsProviderInfobipSettings.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace Lykke.Service.SmsProviderInfobip.Settings +namespace MAVN.Service.SmsProviderInfobip.Settings { [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)] public class SmsProviderInfobipSettings diff --git a/src/MAVN.Service.SmsProviderInfobip/Startup.cs b/src/MAVN.Service.SmsProviderInfobip/Startup.cs index 42bb76f..c71f8db 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Startup.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Startup.cs @@ -1,11 +1,11 @@ +using System; using JetBrains.Annotations; using Lykke.Sdk; -using Lykke.Service.SmsProviderInfobip.Settings; +using MAVN.Service.SmsProviderInfobip.Settings; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using System; -namespace Lykke.Service.SmsProviderInfobip +namespace MAVN.Service.SmsProviderInfobip { [UsedImplicitly] public class Startup diff --git a/src/MAVN.Service.SmsProviderInfobip/Validation/SendSmsRequestModelValidator.cs b/src/MAVN.Service.SmsProviderInfobip/Validation/SendSmsRequestModelValidator.cs index 3969368..ddc6ce6 100644 --- a/src/MAVN.Service.SmsProviderInfobip/Validation/SendSmsRequestModelValidator.cs +++ b/src/MAVN.Service.SmsProviderInfobip/Validation/SendSmsRequestModelValidator.cs @@ -1,8 +1,8 @@ -using System; +using System; using FluentValidation; -using Lykke.Service.NotificationSystemBroker.SmsProviderClient; +using MAVN.Service.NotificationSystemBroker.Contract.SmsProvider; -namespace Lykke.Service.SmsProviderInfobip.Validation +namespace MAVN.Service.SmsProviderInfobip.Validation { public class SendSmsRequestModelValidator : AbstractValidator { diff --git a/tests/MAVN.Service.SmsProviderInfobip.Tests/ClientHttpPathsAreMatchedInControllersTest.cs b/tests/MAVN.Service.SmsProviderInfobip.Tests/ClientHttpPathsAreMatchedInControllersTest.cs index cf87de6..fe36724 100644 --- a/tests/MAVN.Service.SmsProviderInfobip.Tests/ClientHttpPathsAreMatchedInControllersTest.cs +++ b/tests/MAVN.Service.SmsProviderInfobip.Tests/ClientHttpPathsAreMatchedInControllersTest.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Lykke.Service.SmsProviderInfobip.Client; +using MAVN.Service.SmsProviderInfobip.Client; using Microsoft.AspNetCore.Mvc; using Refit; using Xunit; -namespace Lykke.Service.SmsProviderInfobip.Tests +namespace MAVN.Service.SmsProviderInfobip.Tests { public class ClientHttpPathsAreMatchedInControllersTest { diff --git a/tests/MAVN.Service.SmsProviderInfobip.Tests/SmsServiceTests.cs b/tests/MAVN.Service.SmsProviderInfobip.Tests/SmsServiceTests.cs index ab16e9d..a3a21ba 100644 --- a/tests/MAVN.Service.SmsProviderInfobip.Tests/SmsServiceTests.cs +++ b/tests/MAVN.Service.SmsProviderInfobip.Tests/SmsServiceTests.cs @@ -1,14 +1,14 @@ using System.Threading.Tasks; using AutoFixture; using Lykke.Logs; -using Lykke.Service.SmsProviderInfobip.DomainServices.Services; -using Lykke.Service.SmsProviderInfobip.InfobipClient; -using Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Responses; +using MAVN.Service.SmsProviderInfobip.DomainServices.Services; +using MAVN.Service.SmsProviderInfobip.InfobipClient; +using MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Responses; using Moq; using Xunit; -using SendSmsRequestModel = Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Requests.SendSmsRequestModel; +using SendSmsRequestModel = MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Requests.SendSmsRequestModel; -namespace Lykke.Service.SmsProviderInfobip.Tests +namespace MAVN.Service.SmsProviderInfobip.Tests { public class SmsServiceTests { From 25af61d63413b04f2ff8444fdb6d333e0492180b Mon Sep 17 00:00:00 2001 From: Iliyan Iliev Date: Mon, 11 May 2020 14:06:12 +0300 Subject: [PATCH 2/2] fix cosmetic issues --- .../SmsProviderInfobipServiceClientSettings.cs | 8 ++++---- .../Models/Requests/SendSmsRequestModel.cs | 3 +-- .../Services/ISmsService.cs | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs b/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs index 4676ed3..63fa39e 100644 --- a/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs +++ b/client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs @@ -1,14 +1,14 @@ -using Lykke.SettingsReader.Attributes; +using Lykke.SettingsReader.Attributes; -namespace MAVN.Service.SmsProviderInfobip.Client +namespace MAVN.Service.SmsProviderInfobip.Client { /// /// SmsProviderInfobip client settings. /// - public class SmsProviderInfobipServiceClientSettings + public class SmsProviderInfobipServiceClientSettings { /// Service url. [HttpCheck("api/isalive")] - public string ServiceUrl {get; set;} + public string ServiceUrl { get; set; } } } diff --git a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs index 57483d3..916c732 100644 --- a/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs +++ b/client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Requests { @@ -27,5 +27,4 @@ public class SendSmsRequestModel [JsonProperty("text")] public string Text { get; set; } } - } diff --git a/src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs b/src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs index 754f596..20a75e0 100644 --- a/src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs +++ b/src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs @@ -3,7 +3,6 @@ namespace MAVN.Service.SmsProviderInfobip.Domain.Services { public interface ISmsService : ISmsProviderApi - { } }