Merge pull request #9 from IliyanIlievPH/8

Closes #8

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
 {
     /// <summary>
     /// 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();

client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipApi.cs

@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Lykke.Service.SmsProviderInfobip.Client
+namespace MAVN.Service.SmsProviderInfobip.Client
 {
     /// <summary>
     /// SmsProviderInfobip client API interface.

client/MAVN.Service.SmsProviderInfobip.Client/ISmsProviderInfobipClient.cs

@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Lykke.Service.SmsProviderInfobip.Client
+namespace MAVN.Service.SmsProviderInfobip.Client
 {
     /// <summary>
     /// SmsProviderInfobip client interface.

client/MAVN.Service.SmsProviderInfobip.Client/MAVN.Service.SmsProviderInfobip.Client.csproj

@@ -14,7 +14,6 @@
     <None Remove="Lykke.Service.SmsProviderInfobip.Client.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Service.NotificationSystemBroker.SmsProviderClient" Version="1.0.1" />
     <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
     <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
     <PackageReference Include="Refit" Version="4.6.107" />

client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipClient.cs

@@ -1,6 +1,6 @@
 using Lykke.HttpClientGenerator;
 
-namespace Lykke.Service.SmsProviderInfobip.Client
+namespace MAVN.Service.SmsProviderInfobip.Client
 {
     /// <summary>
     /// SmsProviderInfobip API aggregating interface.

client/MAVN.Service.SmsProviderInfobip.Client/SmsProviderInfobipServiceClientSettings.cs

@@ -1,14 +1,14 @@
-using Lykke.SettingsReader.Attributes;
+using Lykke.SettingsReader.Attributes;
 
-namespace Lykke.Service.SmsProviderInfobip.Client 
+namespace MAVN.Service.SmsProviderInfobip.Client
 {
     /// <summary>
     /// SmsProviderInfobip client settings.
     /// </summary>
-    public class SmsProviderInfobipServiceClientSettings 
+    public class SmsProviderInfobipServiceClientSettings
     {
         /// <summary>Service url.</summary>
         [HttpCheck("api/isalive")]
-        public string ServiceUrl {get; set;}
+        public string ServiceUrl { get; set; }
     }
 }

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
 {
     /// <summary>
     /// Interface that describes Infobip SMS client access

client/MAVN.Service.SmsProviderInfobip.InfobipClient/IInfobipClient.cs

@@ -1,4 +1,4 @@
-namespace Lykke.Service.SmsProviderInfobip.InfobipClient
+namespace MAVN.Service.SmsProviderInfobip.InfobipClient
 {
     /// <summary>
     /// Infobip API client

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
 {
     /// <summary>
     /// 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(

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
     {

client/MAVN.Service.SmsProviderInfobip.InfobipClient/Models/Requests/SendSmsRequestModel.cs

@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
-namespace Lykke.Service.SmsProviderInfobip.InfobipClient.Models.Requests
+namespace MAVN.Service.SmsProviderInfobip.InfobipClient.Models.Requests
 {
     /// <summary>
     /// Model used to send SMS
@@ -27,5 +27,4 @@ public class SendSmsRequestModel
         [JsonProperty("text")]
         public string Text { get; set; }
     }
-
 }

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
 {
     /// <summary>
     /// Model that represents SMS response details

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
 {
     /// <summary>
     /// Model that represents SMS response

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
 {
     /// <summary>
     /// Model that represents status response

src/MAVN.Service.SmsProviderInfobip.Domain/MAVN.Service.SmsProviderInfobip.Domain.csproj

@@ -4,8 +4,9 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Service.NotificationSystem.Contract" Version="1.0.3" />
-    <PackageReference Include="Falcon.Service.NotificationSystemBroker.SmsProviderClient" Version="1.0.1" />
     <PackageReference Include="Lykke.Common" Version="7.4.0" />
+    <PackageReference Include="MAVN.Service.NotificationSystem.Contract" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.NotificationSystemBroker.Contract" Version="1.1.1" />
+    <PackageReference Include="MAVN.Service.NotificationSystemBroker.SmsProviderClient" Version="1.1.1" />
   </ItemGroup>
 </Project>

src/MAVN.Service.SmsProviderInfobip.Domain/Services/ISmsService.cs

@@ -1,8 +1,8 @@
-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
     {
     }
 }

src/MAVN.Service.SmsProviderInfobip.DomainServices/MAVN.Service.SmsProviderInfobip.DomainServices.csproj

@@ -1,11 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Service.NotificationSystem.Contract" Version="1.0.3" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.8.1" />
+    <PackageReference Include="MAVN.Service.NotificationSystem.Contract" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.NotificationSystemBroker.Contract" Version="1.1.1" />
+    <PackageReference Include="MAVN.Service.NotificationSystemBroker.SmsProviderClient" Version="1.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\client\MAVN.Service.SmsProviderInfobip.Client\MAVN.Service.SmsProviderInfobip.Client.csproj" />

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
     {

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;
 

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
     {

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
     {

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

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
     {

src/MAVN.Service.SmsProviderInfobip/Settings/InfobipSettings.cs

@@ -1,4 +1,4 @@
-namespace Lykke.Service.SmsProviderInfobip.Settings
+namespace MAVN.Service.SmsProviderInfobip.Settings
 {
     public class InfobipSettings
     {

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

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

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<SendSmsRequestModel>
     {

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
     {

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
     {