From 58dc7c93bc0b8bd6ebc1949cbcd277345d245c4f Mon Sep 17 00:00:00 2001 From: TomPallister Date: Tue, 4 Jul 2017 19:14:37 +0100 Subject: [PATCH] moved json converters under authentication feature --- .../JsonConverters/AuthenticationConfigConverter.cs | 4 ++-- .../Repository/ConsulOcelotConfigurationRepository.cs | 3 +-- test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) rename src/Ocelot/{ => Authentication}/JsonConverters/AuthenticationConfigConverter.cs (96%) diff --git a/src/Ocelot/JsonConverters/AuthenticationConfigConverter.cs b/src/Ocelot/Authentication/JsonConverters/AuthenticationConfigConverter.cs similarity index 96% rename from src/Ocelot/JsonConverters/AuthenticationConfigConverter.cs rename to src/Ocelot/Authentication/JsonConverters/AuthenticationConfigConverter.cs index 06699c28..6aca01be 100644 --- a/src/Ocelot/JsonConverters/AuthenticationConfigConverter.cs +++ b/src/Ocelot/Authentication/JsonConverters/AuthenticationConfigConverter.cs @@ -1,10 +1,10 @@ using System; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Ocelot.Configuration; -namespace Ocelot.AcceptanceTests +namespace Ocelot.Authentication.JsonConverters { - using Newtonsoft.Json.Linq; public class AuthenticationConfigConverter : JsonConverter { public override bool CanWrite => false; diff --git a/src/Ocelot/Configuration/Repository/ConsulOcelotConfigurationRepository.cs b/src/Ocelot/Configuration/Repository/ConsulOcelotConfigurationRepository.cs index 9fd26f87..6fa6f72a 100644 --- a/src/Ocelot/Configuration/Repository/ConsulOcelotConfigurationRepository.cs +++ b/src/Ocelot/Configuration/Repository/ConsulOcelotConfigurationRepository.cs @@ -4,13 +4,12 @@ using System.Threading.Tasks; using Consul; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Ocelot.Authentication.JsonConverters; using Ocelot.Responses; using Ocelot.ServiceDiscovery; namespace Ocelot.Configuration.Repository { - using Ocelot.AcceptanceTests; - public class ConsulOcelotConfigurationRepository : IOcelotConfigurationRepository { private readonly ConsulClient _consul; diff --git a/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs b/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs index afed1164..231f8410 100644 --- a/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs +++ b/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; +using Ocelot.Authentication.JsonConverters; using Ocelot.Configuration; using Ocelot.Configuration.File; using Ocelot.Configuration.Repository;