From 8b0ceeda5b8668bd9ae2796182f1e8a0e0ed1b7d Mon Sep 17 00:00:00 2001 From: TomPallister Date: Tue, 18 Oct 2016 19:10:09 +0100 Subject: [PATCH] removed library namespace --- .../Handler/AuthenticationHandler.cs | 2 +- .../Creator/AuthenticationHandlerCreator.cs | 4 +- .../Creator/IAuthenticationHandlerCreator.cs | 4 +- .../Factory/AuthenticationHandlerFactory.cs | 8 ++-- .../Factory/IAuthenticationHandlerFactory.cs | 4 +- ...nableToCreateAuthenticationHandlerError.cs | 4 +- .../SupportedAuthenticationProviders.cs | 2 +- .../Middleware/AuthenticationMiddleware.cs | 14 +++--- ...nticationMiddlewareMiddlewareExtensions.cs | 2 +- .../Configuration/AuthenticationOptions.cs | 6 +-- .../Configuration/Builder/ReRouteBuilder.cs | 2 +- src/Ocelot/Configuration/ClaimToHeader.cs | 2 +- .../Creator/IOcelotConfigurationCreator.cs | 4 +- .../Creator/YamlOcelotConfigurationCreator.cs | 10 ++-- .../Configuration/IOcelotConfiguration.cs | 6 +-- .../Configuration/OcelotConfiguration.cs | 2 +- .../ClaimToHeaderConfigurationParser.cs | 7 ++- .../IClaimToHeaderConfigurationParser.cs | 4 +- .../Parser/InstructionNotForClaimsError.cs | 4 +- .../Parser/NoInstructionsError.cs | 4 +- .../Parser/ParsingConfigurationHeaderError.cs | 4 +- .../Provider/IOcelotConfigurationProvider.cs | 4 +- .../YamlOcelotConfigurationProvider.cs | 8 ++-- src/Ocelot/Configuration/ReRoute.cs | 2 +- .../IOcelotConfigurationRepository.cs | 4 +- .../InMemoryOcelotConfigurationRepository.cs | 4 +- .../ConfigurationValidationResult.cs | 4 +- .../Validator/ConfigurationValidator.cs | 11 ++--- .../DownstreamTemplateAlreadyUsedError.cs | 4 +- .../Validator/IConfigurationValidator.cs | 6 +-- .../UnsupportedAuthenticationProviderError.cs | 4 +- .../Yaml/YamlAuthenticationOptions.cs | 6 +-- .../Configuration/Yaml/YamlConfiguration.cs | 6 +-- src/Ocelot/Configuration/Yaml/YamlReRoute.cs | 6 +-- .../ServiceCollectionExtensions.cs | 47 +++++++++---------- .../DownstreamRouteFinder/DownstreamRoute.cs | 9 ++-- .../Finder/DownstreamRouteFinder.cs | 10 ++-- .../Finder/IDownstreamRouteFinder.cs | 4 +- .../UnableToFindDownstreamRouteError.cs | 4 +- .../DownstreamRouteFinderMiddleware.cs | 8 ++-- ...wnstreamRouteFinderMiddlewareExtensions.cs | 2 +- .../ITemplateVariableNameAndValueFinder.cs | 4 +- .../IUrlPathToUrlTemplateMatcher.cs | 4 +- .../UrlMatcher/RegExUrlMatcher.cs | 4 +- .../TemplateVariableNameAndValue.cs | 2 +- .../TemplateVariableNameAndValueFinder.cs | 4 +- .../UrlMatcher/UrlMatch.cs | 2 +- .../DownstreamUrlCreatorMiddleware.cs | 10 ++-- ...ownstreamUrlCreatorMiddlewareExtensions.cs | 2 +- .../DownstreamUrlTemplateVariableReplacer.cs | 6 +-- ...wnstreamUrlPathTemplateVariableReplacer.cs | 6 +-- src/Ocelot/Errors/Error.cs | 2 +- src/Ocelot/Errors/OcelotErrorCode.cs | 2 +- .../HeaderBuilder/AddHeadersToRequest.cs | 8 ++-- .../HeaderBuilder/IAddHeadersToRequest.cs | 6 +-- .../HttpRequestHeadersBuilderMiddleware.cs | 8 ++-- ...questHeadersBuilderMiddlewareExtensions.cs | 2 +- .../Parser/CannotFindClaimError.cs | 4 +- .../HeaderBuilder/Parser/ClaimsParser.cs | 6 +-- .../HeaderBuilder/Parser/IClaimsParser.cs | 4 +- src/Ocelot/Middleware/OcelotMiddleware.cs | 9 ++-- .../Middleware/OcelotMiddlewareExtensions.cs | 19 ++++---- src/Ocelot/Middleware/UnauthenticatedError.cs | 6 +-- src/Ocelot/Properties/AssemblyInfo.cs | 2 +- .../Builder/HttpRequestBuilder.cs | 4 +- .../RequestBuilder/Builder/IRequestBuilder.cs | 4 +- .../HttpRequestBuilderMiddleware.cs | 8 ++-- .../HttpRequestBuilderMiddlewareExtensions.cs | 2 +- src/Ocelot/RequestBuilder/Request.cs | 8 ++-- .../Requester/HttpClientHttpRequester.cs | 18 +++---- src/Ocelot/Requester/IHttpRequester.cs | 12 ++--- .../Middleware/HttpRequesterMiddleware.cs | 8 ++-- .../HttpRequesterMiddlewareExtensions.cs | 2 +- .../Requester/UnableToCompleteRequestError.cs | 8 ++-- .../Responder/ErrorsToHttpStatusCodeMapper.cs | 12 ++--- src/Ocelot/Responder/HttpContextResponder.cs | 10 ++-- .../IErrorsToHttpStatusCodeMapper.cs | 10 ++-- src/Ocelot/Responder/IHttpResponder.cs | 10 ++-- .../Middleware/HttpResponderMiddleware.cs | 6 +-- .../HttpResponderMiddlewareExtensions.cs | 2 +- src/Ocelot/Responses/ErrorResponse.cs | 8 ++-- src/Ocelot/Responses/ErrorResponseGeneric.cs | 8 ++-- src/Ocelot/Responses/OkResponse.cs | 2 +- src/Ocelot/Responses/OkResponseGeneric.cs | 2 +- src/Ocelot/Responses/Response.cs | 8 ++-- src/Ocelot/Responses/ResponseGeneric.cs | 8 ++-- src/Ocelot/ScopedData/CannotAddDataError.cs | 4 +- src/Ocelot/ScopedData/CannotFindDataError.cs | 4 +- .../IScopedRequestDataRepository.cs | 4 +- .../ScopedData/ScopedRequestDataRepository.cs | 6 +-- .../AuthenticationTests.cs | 2 +- .../ClaimsToHeadersForwardingTests.cs | 2 +- .../ReturnsErrorTests.cs | 2 +- test/Ocelot.AcceptanceTests/RoutingTests.cs | 3 +- test/Ocelot.ManualTest/Startup.cs | 4 +- .../AuthenticationHandlerFactoryTests.cs | 14 +++--- .../AuthenticationMiddlewareTests.cs | 14 +++--- .../ConfigurationHeadersExtractorTests.cs | 8 ++-- .../ConfigurationValidationTests.cs | 7 ++- .../InMemoryConfigurationRepositoryTests.cs | 8 ++-- .../YamlConfigurationCreatorTests.cs | 17 +++---- .../YamlConfigurationProviderTests.cs | 13 +++-- .../DownstreamRouteFinderMiddlewareTests.cs | 14 +++--- .../DownstreamRouteFinderTests.cs | 17 ++++--- .../UrlMatcher/RegExUrlMatcherTests.cs | 4 +- ...TemplateVariableNameAndValueFinderTests.cs | 4 +- .../DownstreamUrlCreatorMiddlewareTests.cs | 14 +++--- ...eamUrlPathTemplateVariableReplacerTests.cs | 10 ++-- .../HeaderBuilder/AddHeadersToRequestTests.cs | 10 ++-- .../HeaderBuilder/ClaimParserTests.cs | 6 +-- ...ttpRequestHeadersBuilderMiddlewareTests.cs | 16 +++---- .../ScopedRequestDataRepositoryTests.cs | 5 +- .../HttpRequestBuilderMiddlewareTests.cs | 10 ++-- .../RequestBuilder/RequestBuilderTests.cs | 7 ++- .../Requester/HttpRequesterMiddlewareTests.cs | 10 ++-- .../ErrorsToHttpStatusCodeMapperTests.cs | 9 ++-- .../Responder/HttpResponderMiddlewareTests.cs | 8 ++-- 117 files changed, 384 insertions(+), 406 deletions(-) diff --git a/src/Ocelot/Authentication/Handler/AuthenticationHandler.cs b/src/Ocelot/Authentication/Handler/AuthenticationHandler.cs index ccdf0a66..029147d6 100644 --- a/src/Ocelot/Authentication/Handler/AuthenticationHandler.cs +++ b/src/Ocelot/Authentication/Handler/AuthenticationHandler.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Http; -namespace Ocelot.Library.Authentication.Handler +namespace Ocelot.Authentication.Handler { public class AuthenticationHandler { diff --git a/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs b/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs index 1ff79b20..82765d21 100644 --- a/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs +++ b/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs @@ -1,9 +1,9 @@ using IdentityServer4.AccessTokenValidation; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.Authentication.Handler.Creator +namespace Ocelot.Authentication.Handler.Creator { using AuthenticationOptions = Configuration.AuthenticationOptions; diff --git a/src/Ocelot/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs b/src/Ocelot/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs index 7d3e64c1..6baa0385 100644 --- a/src/Ocelot/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs +++ b/src/Ocelot/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.Authentication.Handler.Creator +namespace Ocelot.Authentication.Handler.Creator { using AuthenticationOptions = Configuration.AuthenticationOptions; diff --git a/src/Ocelot/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs b/src/Ocelot/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs index 8ef9993c..46594435 100644 --- a/src/Ocelot/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs +++ b/src/Ocelot/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Builder; -using Ocelot.Library.Authentication.Handler.Creator; -using Ocelot.Library.Errors; -using Ocelot.Library.Responses; +using Ocelot.Authentication.Handler.Creator; +using Ocelot.Errors; +using Ocelot.Responses; -namespace Ocelot.Library.Authentication.Handler.Factory +namespace Ocelot.Authentication.Handler.Factory { using AuthenticationOptions = Configuration.AuthenticationOptions; diff --git a/src/Ocelot/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs b/src/Ocelot/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs index 97b7d005..abc09ed8 100644 --- a/src/Ocelot/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs +++ b/src/Ocelot/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.Authentication.Handler.Factory +namespace Ocelot.Authentication.Handler.Factory { using AuthenticationOptions = Configuration.AuthenticationOptions; diff --git a/src/Ocelot/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs b/src/Ocelot/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs index ba066955..7e18b203 100644 --- a/src/Ocelot/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs +++ b/src/Ocelot/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.Authentication.Handler.Factory +namespace Ocelot.Authentication.Handler.Factory { public class UnableToCreateAuthenticationHandlerError : Error { diff --git a/src/Ocelot/Authentication/Handler/SupportedAuthenticationProviders.cs b/src/Ocelot/Authentication/Handler/SupportedAuthenticationProviders.cs index c2d624fe..2a815ee0 100644 --- a/src/Ocelot/Authentication/Handler/SupportedAuthenticationProviders.cs +++ b/src/Ocelot/Authentication/Handler/SupportedAuthenticationProviders.cs @@ -1,4 +1,4 @@ -namespace Ocelot.Library.Authentication.Handler +namespace Ocelot.Authentication.Handler { public enum SupportedAuthenticationProviders { diff --git a/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs b/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs index 7a74bd6a..9712a6cd 100644 --- a/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs +++ b/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs @@ -2,14 +2,14 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Authentication.Handler.Factory; -using Ocelot.Library.Configuration; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.Errors; -using Ocelot.Library.Middleware; -using Ocelot.Library.ScopedData; +using Ocelot.Authentication.Handler.Factory; +using Ocelot.Configuration; +using Ocelot.DownstreamRouteFinder; +using Ocelot.Errors; +using Ocelot.Middleware; +using Ocelot.ScopedData; -namespace Ocelot.Library.Authentication.Middleware +namespace Ocelot.Authentication.Middleware { public class AuthenticationMiddleware : OcelotMiddleware { diff --git a/src/Ocelot/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs b/src/Ocelot/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs index 9083a1b2..8e1a97e8 100644 --- a/src/Ocelot/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs +++ b/src/Ocelot/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; -namespace Ocelot.Library.Authentication.Middleware +namespace Ocelot.Authentication.Middleware { public static class AuthenticationMiddlewareMiddlewareExtensions { diff --git a/src/Ocelot/Configuration/AuthenticationOptions.cs b/src/Ocelot/Configuration/AuthenticationOptions.cs index 99105c4a..3b36453c 100644 --- a/src/Ocelot/Configuration/AuthenticationOptions.cs +++ b/src/Ocelot/Configuration/AuthenticationOptions.cs @@ -1,7 +1,7 @@ -namespace Ocelot.Library.Configuration -{ - using System.Collections.Generic; +using System.Collections.Generic; +namespace Ocelot.Configuration +{ public class AuthenticationOptions { public AuthenticationOptions(string provider, string providerRootUrl, string scopeName, bool requireHttps, List additionalScopes, string scopeSecret) diff --git a/src/Ocelot/Configuration/Builder/ReRouteBuilder.cs b/src/Ocelot/Configuration/Builder/ReRouteBuilder.cs index c6f1e90a..e369d78d 100644 --- a/src/Ocelot/Configuration/Builder/ReRouteBuilder.cs +++ b/src/Ocelot/Configuration/Builder/ReRouteBuilder.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Ocelot.Library.Configuration.Builder +namespace Ocelot.Configuration.Builder { public class ReRouteBuilder { diff --git a/src/Ocelot/Configuration/ClaimToHeader.cs b/src/Ocelot/Configuration/ClaimToHeader.cs index d768046a..dce96268 100644 --- a/src/Ocelot/Configuration/ClaimToHeader.cs +++ b/src/Ocelot/Configuration/ClaimToHeader.cs @@ -1,4 +1,4 @@ -namespace Ocelot.Library.Configuration +namespace Ocelot.Configuration { public class ClaimToHeader { diff --git a/src/Ocelot/Configuration/Creator/IOcelotConfigurationCreator.cs b/src/Ocelot/Configuration/Creator/IOcelotConfigurationCreator.cs index 1465c23f..6cc7c2e8 100644 --- a/src/Ocelot/Configuration/Creator/IOcelotConfigurationCreator.cs +++ b/src/Ocelot/Configuration/Creator/IOcelotConfigurationCreator.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Creator +namespace Ocelot.Configuration.Creator { public interface IOcelotConfigurationCreator { diff --git a/src/Ocelot/Configuration/Creator/YamlOcelotConfigurationCreator.cs b/src/Ocelot/Configuration/Creator/YamlOcelotConfigurationCreator.cs index 433acc66..b4ff9d15 100644 --- a/src/Ocelot/Configuration/Creator/YamlOcelotConfigurationCreator.cs +++ b/src/Ocelot/Configuration/Creator/YamlOcelotConfigurationCreator.cs @@ -2,12 +2,12 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Ocelot.Library.Configuration.Parser; -using Ocelot.Library.Configuration.Validator; -using Ocelot.Library.Configuration.Yaml; -using Ocelot.Library.Responses; +using Ocelot.Configuration.Parser; +using Ocelot.Configuration.Validator; +using Ocelot.Configuration.Yaml; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Creator +namespace Ocelot.Configuration.Creator { /// /// Register as singleton diff --git a/src/Ocelot/Configuration/IOcelotConfiguration.cs b/src/Ocelot/Configuration/IOcelotConfiguration.cs index 0e7de3c7..8359a2e1 100644 --- a/src/Ocelot/Configuration/IOcelotConfiguration.cs +++ b/src/Ocelot/Configuration/IOcelotConfiguration.cs @@ -1,7 +1,7 @@ -namespace Ocelot.Library.Configuration -{ - using System.Collections.Generic; +using System.Collections.Generic; +namespace Ocelot.Configuration +{ public interface IOcelotConfiguration { List ReRoutes { get; } diff --git a/src/Ocelot/Configuration/OcelotConfiguration.cs b/src/Ocelot/Configuration/OcelotConfiguration.cs index c6fc0786..3b0858eb 100644 --- a/src/Ocelot/Configuration/OcelotConfiguration.cs +++ b/src/Ocelot/Configuration/OcelotConfiguration.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Ocelot.Library.Configuration +namespace Ocelot.Configuration { public class OcelotConfiguration : IOcelotConfiguration { diff --git a/src/Ocelot/Configuration/Parser/ClaimToHeaderConfigurationParser.cs b/src/Ocelot/Configuration/Parser/ClaimToHeaderConfigurationParser.cs index e2aa94d5..2d81ec1b 100644 --- a/src/Ocelot/Configuration/Parser/ClaimToHeaderConfigurationParser.cs +++ b/src/Ocelot/Configuration/Parser/ClaimToHeaderConfigurationParser.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.Text.RegularExpressions; -using Ocelot.Library.Errors; -using Ocelot.Library.RequestBuilder; -using Ocelot.Library.Responses; +using Ocelot.Errors; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Parser +namespace Ocelot.Configuration.Parser { public class ClaimToHeaderConfigurationParser : IClaimToHeaderConfigurationParser { diff --git a/src/Ocelot/Configuration/Parser/IClaimToHeaderConfigurationParser.cs b/src/Ocelot/Configuration/Parser/IClaimToHeaderConfigurationParser.cs index 633cfcc6..d45cd337 100644 --- a/src/Ocelot/Configuration/Parser/IClaimToHeaderConfigurationParser.cs +++ b/src/Ocelot/Configuration/Parser/IClaimToHeaderConfigurationParser.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Parser +namespace Ocelot.Configuration.Parser { public interface IClaimToHeaderConfigurationParser { diff --git a/src/Ocelot/Configuration/Parser/InstructionNotForClaimsError.cs b/src/Ocelot/Configuration/Parser/InstructionNotForClaimsError.cs index 651d9caa..62cf8741 100644 --- a/src/Ocelot/Configuration/Parser/InstructionNotForClaimsError.cs +++ b/src/Ocelot/Configuration/Parser/InstructionNotForClaimsError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.Configuration.Parser +namespace Ocelot.Configuration.Parser { public class InstructionNotForClaimsError : Error { diff --git a/src/Ocelot/Configuration/Parser/NoInstructionsError.cs b/src/Ocelot/Configuration/Parser/NoInstructionsError.cs index 732603a3..09aa0ccb 100644 --- a/src/Ocelot/Configuration/Parser/NoInstructionsError.cs +++ b/src/Ocelot/Configuration/Parser/NoInstructionsError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.Configuration.Parser +namespace Ocelot.Configuration.Parser { public class NoInstructionsError : Error { diff --git a/src/Ocelot/Configuration/Parser/ParsingConfigurationHeaderError.cs b/src/Ocelot/Configuration/Parser/ParsingConfigurationHeaderError.cs index 0b7409bc..9b03c95d 100644 --- a/src/Ocelot/Configuration/Parser/ParsingConfigurationHeaderError.cs +++ b/src/Ocelot/Configuration/Parser/ParsingConfigurationHeaderError.cs @@ -1,7 +1,7 @@ using System; -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.Configuration.Parser +namespace Ocelot.Configuration.Parser { public class ParsingConfigurationHeaderError : Error { diff --git a/src/Ocelot/Configuration/Provider/IOcelotConfigurationProvider.cs b/src/Ocelot/Configuration/Provider/IOcelotConfigurationProvider.cs index 6918ca6d..30ded2e9 100644 --- a/src/Ocelot/Configuration/Provider/IOcelotConfigurationProvider.cs +++ b/src/Ocelot/Configuration/Provider/IOcelotConfigurationProvider.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Provider +namespace Ocelot.Configuration.Provider { public interface IOcelotConfigurationProvider { diff --git a/src/Ocelot/Configuration/Provider/YamlOcelotConfigurationProvider.cs b/src/Ocelot/Configuration/Provider/YamlOcelotConfigurationProvider.cs index bf3faab7..2a92f786 100644 --- a/src/Ocelot/Configuration/Provider/YamlOcelotConfigurationProvider.cs +++ b/src/Ocelot/Configuration/Provider/YamlOcelotConfigurationProvider.cs @@ -1,8 +1,8 @@ -using Ocelot.Library.Configuration.Creator; -using Ocelot.Library.Configuration.Repository; -using Ocelot.Library.Responses; +using Ocelot.Configuration.Creator; +using Ocelot.Configuration.Repository; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Provider +namespace Ocelot.Configuration.Provider { /// /// Register as singleton diff --git a/src/Ocelot/Configuration/ReRoute.cs b/src/Ocelot/Configuration/ReRoute.cs index d6df121d..8a67de84 100644 --- a/src/Ocelot/Configuration/ReRoute.cs +++ b/src/Ocelot/Configuration/ReRoute.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Ocelot.Library.Configuration +namespace Ocelot.Configuration { public class ReRoute { diff --git a/src/Ocelot/Configuration/Repository/IOcelotConfigurationRepository.cs b/src/Ocelot/Configuration/Repository/IOcelotConfigurationRepository.cs index bd99149c..312b5553 100644 --- a/src/Ocelot/Configuration/Repository/IOcelotConfigurationRepository.cs +++ b/src/Ocelot/Configuration/Repository/IOcelotConfigurationRepository.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Repository +namespace Ocelot.Configuration.Repository { public interface IOcelotConfigurationRepository { diff --git a/src/Ocelot/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs b/src/Ocelot/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs index f590ce8b..04f34f8d 100644 --- a/src/Ocelot/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs +++ b/src/Ocelot/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Repository +namespace Ocelot.Configuration.Repository { /// /// Register as singleton diff --git a/src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs b/src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs index 3e40a412..32dec98b 100644 --- a/src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs +++ b/src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.Configuration.Validator +namespace Ocelot.Configuration.Validator { public class ConfigurationValidationResult { diff --git a/src/Ocelot/Configuration/Validator/ConfigurationValidator.cs b/src/Ocelot/Configuration/Validator/ConfigurationValidator.cs index 60beb06f..30b30fc3 100644 --- a/src/Ocelot/Configuration/Validator/ConfigurationValidator.cs +++ b/src/Ocelot/Configuration/Validator/ConfigurationValidator.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using Ocelot.Library.Authentication; -using Ocelot.Library.Authentication.Handler; -using Ocelot.Library.Configuration.Yaml; -using Ocelot.Library.Errors; -using Ocelot.Library.Responses; +using Ocelot.Authentication.Handler; +using Ocelot.Configuration.Yaml; +using Ocelot.Errors; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Validator +namespace Ocelot.Configuration.Validator { public class ConfigurationValidator : IConfigurationValidator { diff --git a/src/Ocelot/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs b/src/Ocelot/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs index ff9a44fa..b836b1eb 100644 --- a/src/Ocelot/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs +++ b/src/Ocelot/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.Configuration.Validator +namespace Ocelot.Configuration.Validator { public class DownstreamTemplateAlreadyUsedError : Error { diff --git a/src/Ocelot/Configuration/Validator/IConfigurationValidator.cs b/src/Ocelot/Configuration/Validator/IConfigurationValidator.cs index ddb2831d..10955836 100644 --- a/src/Ocelot/Configuration/Validator/IConfigurationValidator.cs +++ b/src/Ocelot/Configuration/Validator/IConfigurationValidator.cs @@ -1,7 +1,7 @@ -using Ocelot.Library.Configuration.Yaml; -using Ocelot.Library.Responses; +using Ocelot.Configuration.Yaml; +using Ocelot.Responses; -namespace Ocelot.Library.Configuration.Validator +namespace Ocelot.Configuration.Validator { public interface IConfigurationValidator { diff --git a/src/Ocelot/Configuration/Validator/UnsupportedAuthenticationProviderError.cs b/src/Ocelot/Configuration/Validator/UnsupportedAuthenticationProviderError.cs index e963cb17..e4f441bf 100644 --- a/src/Ocelot/Configuration/Validator/UnsupportedAuthenticationProviderError.cs +++ b/src/Ocelot/Configuration/Validator/UnsupportedAuthenticationProviderError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.Configuration.Validator +namespace Ocelot.Configuration.Validator { public class UnsupportedAuthenticationProviderError : Error { diff --git a/src/Ocelot/Configuration/Yaml/YamlAuthenticationOptions.cs b/src/Ocelot/Configuration/Yaml/YamlAuthenticationOptions.cs index 2e9e9b27..16faa03e 100644 --- a/src/Ocelot/Configuration/Yaml/YamlAuthenticationOptions.cs +++ b/src/Ocelot/Configuration/Yaml/YamlAuthenticationOptions.cs @@ -1,7 +1,7 @@ -namespace Ocelot.Library.Configuration.Yaml -{ - using System.Collections.Generic; +using System.Collections.Generic; +namespace Ocelot.Configuration.Yaml +{ public class YamlAuthenticationOptions { public string Provider { get; set; } diff --git a/src/Ocelot/Configuration/Yaml/YamlConfiguration.cs b/src/Ocelot/Configuration/Yaml/YamlConfiguration.cs index dd6fb081..2224f7d5 100644 --- a/src/Ocelot/Configuration/Yaml/YamlConfiguration.cs +++ b/src/Ocelot/Configuration/Yaml/YamlConfiguration.cs @@ -1,7 +1,7 @@ -namespace Ocelot.Library.Configuration.Yaml -{ - using System.Collections.Generic; +using System.Collections.Generic; +namespace Ocelot.Configuration.Yaml +{ public class YamlConfiguration { public YamlConfiguration() diff --git a/src/Ocelot/Configuration/Yaml/YamlReRoute.cs b/src/Ocelot/Configuration/Yaml/YamlReRoute.cs index 675044a3..9c18d7a8 100644 --- a/src/Ocelot/Configuration/Yaml/YamlReRoute.cs +++ b/src/Ocelot/Configuration/Yaml/YamlReRoute.cs @@ -1,7 +1,7 @@ -namespace Ocelot.Library.Configuration.Yaml -{ - using System.Collections.Generic; +using System.Collections.Generic; +namespace Ocelot.Configuration.Yaml +{ public class YamlReRoute { public YamlReRoute() diff --git a/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs b/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs index 1452923b..38dad7ba 100644 --- a/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs +++ b/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs @@ -1,31 +1,26 @@ -using Ocelot.Library.Authentication.Handler.Creator; -using Ocelot.Library.Authentication.Handler.Factory; -using Ocelot.Library.Configuration.Creator; -using Ocelot.Library.Configuration.Parser; -using Ocelot.Library.Configuration.Provider; -using Ocelot.Library.Configuration.Repository; -using Ocelot.Library.Configuration.Validator; -using Ocelot.Library.DownstreamRouteFinder.Finder; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer; -using Ocelot.Library.HeaderBuilder; -using Ocelot.Library.HeaderBuilder.Parser; -using Ocelot.Library.RequestBuilder.Builder; -using Ocelot.Library.ScopedData; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Ocelot.Authentication.Handler.Creator; +using Ocelot.Authentication.Handler.Factory; +using Ocelot.Configuration.Creator; +using Ocelot.Configuration.Parser; +using Ocelot.Configuration.Provider; +using Ocelot.Configuration.Repository; +using Ocelot.Configuration.Validator; +using Ocelot.Configuration.Yaml; +using Ocelot.DownstreamRouteFinder.Finder; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.DownstreamUrlCreator.UrlTemplateReplacer; +using Ocelot.HeaderBuilder; +using Ocelot.HeaderBuilder.Parser; +using Ocelot.RequestBuilder.Builder; +using Ocelot.Requester; +using Ocelot.Responder; +using Ocelot.ScopedData; -namespace Ocelot.Library.DependencyInjection +namespace Ocelot.DependencyInjection { - using Authentication; - using Configuration; - using Configuration.Yaml; - using DownstreamRouteFinder; - using Microsoft.AspNetCore.Http; - using Microsoft.Extensions.Configuration; - using Microsoft.Extensions.DependencyInjection; - using RequestBuilder; - using Requester; - using Responder; - public static class ServiceCollectionExtensions { public static IServiceCollection AddOcelotYamlConfiguration(this IServiceCollection services, IConfigurationRoot configurationRoot) diff --git a/src/Ocelot/DownstreamRouteFinder/DownstreamRoute.cs b/src/Ocelot/DownstreamRouteFinder/DownstreamRoute.cs index 7f7fcc61..7e9f0189 100644 --- a/src/Ocelot/DownstreamRouteFinder/DownstreamRoute.cs +++ b/src/Ocelot/DownstreamRouteFinder/DownstreamRoute.cs @@ -1,10 +1,9 @@ -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; +using System.Collections.Generic; +using Ocelot.Configuration; +using Ocelot.DownstreamRouteFinder.UrlMatcher; -namespace Ocelot.Library.DownstreamRouteFinder +namespace Ocelot.DownstreamRouteFinder { - using System.Collections.Generic; - using Configuration; - public class DownstreamRoute { public DownstreamRoute(List templateVariableNameAndValues, ReRoute reRoute) diff --git a/src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs b/src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs index 340ca4d7..39164068 100644 --- a/src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs +++ b/src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using Ocelot.Library.Configuration.Provider; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.Errors; -using Ocelot.Library.Responses; +using Ocelot.Configuration.Provider; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.Errors; +using Ocelot.Responses; -namespace Ocelot.Library.DownstreamRouteFinder.Finder +namespace Ocelot.DownstreamRouteFinder.Finder { public class DownstreamRouteFinder : IDownstreamRouteFinder { diff --git a/src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs b/src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs index 3e0cafb4..e351ab2f 100644 --- a/src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs +++ b/src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.DownstreamRouteFinder.Finder +namespace Ocelot.DownstreamRouteFinder.Finder { public interface IDownstreamRouteFinder { diff --git a/src/Ocelot/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs b/src/Ocelot/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs index 92595ea2..d73587b1 100644 --- a/src/Ocelot/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs +++ b/src/Ocelot/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.DownstreamRouteFinder.Finder +namespace Ocelot.DownstreamRouteFinder.Finder { public class UnableToFindDownstreamRouteError : Error { diff --git a/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs b/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs index 9dddc81a..e39c3225 100644 --- a/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs +++ b/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Ocelot.Library.DownstreamRouteFinder.Finder; -using Ocelot.Library.Middleware; -using Ocelot.Library.ScopedData; +using Ocelot.DownstreamRouteFinder.Finder; +using Ocelot.Middleware; +using Ocelot.ScopedData; -namespace Ocelot.Library.DownstreamRouteFinder.Middleware +namespace Ocelot.DownstreamRouteFinder.Middleware { public class DownstreamRouteFinderMiddleware : OcelotMiddleware { diff --git a/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs b/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs index e07cbcc5..0cd27758 100644 --- a/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs +++ b/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; -namespace Ocelot.Library.DownstreamRouteFinder.Middleware +namespace Ocelot.DownstreamRouteFinder.Middleware { public static class DownstreamRouteFinderMiddlewareExtensions { diff --git a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs index 31136199..638b2c40 100644 --- a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs +++ b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher +namespace Ocelot.DownstreamRouteFinder.UrlMatcher { public interface ITemplateVariableNameAndValueFinder { diff --git a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs index 86af26bb..6c8956a2 100644 --- a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs +++ b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher +namespace Ocelot.DownstreamRouteFinder.UrlMatcher { public interface IUrlPathToUrlTemplateMatcher { diff --git a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs index 0005c81a..415ee556 100644 --- a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs +++ b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs @@ -1,7 +1,7 @@ using System.Text.RegularExpressions; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher +namespace Ocelot.DownstreamRouteFinder.UrlMatcher { public class RegExUrlMatcher : IUrlPathToUrlTemplateMatcher { diff --git a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs index c2283720..7ddd2448 100644 --- a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs +++ b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs @@ -1,4 +1,4 @@ -namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher +namespace Ocelot.DownstreamRouteFinder.UrlMatcher { public class TemplateVariableNameAndValue { diff --git a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs index cffada4c..f2d3fa79 100644 --- a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs +++ b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher +namespace Ocelot.DownstreamRouteFinder.UrlMatcher { public class TemplateVariableNameAndValueFinder : ITemplateVariableNameAndValueFinder { diff --git a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs index 55ebb807..aa2a6f06 100644 --- a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs +++ b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs @@ -1,4 +1,4 @@ -namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher +namespace Ocelot.DownstreamRouteFinder.UrlMatcher { public class UrlMatch { diff --git a/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs b/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs index 604c9132..ff19ccfb 100644 --- a/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs +++ b/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer; -using Ocelot.Library.Middleware; -using Ocelot.Library.ScopedData; +using Ocelot.DownstreamRouteFinder; +using Ocelot.DownstreamUrlCreator.UrlTemplateReplacer; +using Ocelot.Middleware; +using Ocelot.ScopedData; -namespace Ocelot.Library.DownstreamUrlCreator.Middleware +namespace Ocelot.DownstreamUrlCreator.Middleware { public class DownstreamUrlCreatorMiddleware : OcelotMiddleware { diff --git a/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs b/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs index 63d847d2..34bfaa54 100644 --- a/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs +++ b/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; -namespace Ocelot.Library.DownstreamUrlCreator.Middleware +namespace Ocelot.DownstreamUrlCreator.Middleware { public static class DownstreamUrlCreatorMiddlewareExtensions { diff --git a/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs b/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs index b8ff44d9..83570008 100644 --- a/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs +++ b/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs @@ -1,8 +1,8 @@ using System.Text; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.Responses; +using Ocelot.DownstreamRouteFinder; +using Ocelot.Responses; -namespace Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer +namespace Ocelot.DownstreamUrlCreator.UrlTemplateReplacer { public class DownstreamUrlTemplateVariableReplacer : IDownstreamUrlTemplateVariableReplacer { diff --git a/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs b/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs index ba92174a..83b93d00 100644 --- a/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs +++ b/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs @@ -1,7 +1,7 @@ -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.Responses; +using Ocelot.DownstreamRouteFinder; +using Ocelot.Responses; -namespace Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer +namespace Ocelot.DownstreamUrlCreator.UrlTemplateReplacer { public interface IDownstreamUrlTemplateVariableReplacer { diff --git a/src/Ocelot/Errors/Error.cs b/src/Ocelot/Errors/Error.cs index 4c4d96d5..25a9f5d4 100644 --- a/src/Ocelot/Errors/Error.cs +++ b/src/Ocelot/Errors/Error.cs @@ -1,4 +1,4 @@ -namespace Ocelot.Library.Errors +namespace Ocelot.Errors { public abstract class Error { diff --git a/src/Ocelot/Errors/OcelotErrorCode.cs b/src/Ocelot/Errors/OcelotErrorCode.cs index 643f00ef..28679449 100644 --- a/src/Ocelot/Errors/OcelotErrorCode.cs +++ b/src/Ocelot/Errors/OcelotErrorCode.cs @@ -1,4 +1,4 @@ -namespace Ocelot.Library.Errors +namespace Ocelot.Errors { public enum OcelotErrorCode { diff --git a/src/Ocelot/HeaderBuilder/AddHeadersToRequest.cs b/src/Ocelot/HeaderBuilder/AddHeadersToRequest.cs index 6c2634fa..b6efc334 100644 --- a/src/Ocelot/HeaderBuilder/AddHeadersToRequest.cs +++ b/src/Ocelot/HeaderBuilder/AddHeadersToRequest.cs @@ -2,11 +2,11 @@ using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; -using Ocelot.Library.Configuration; -using Ocelot.Library.HeaderBuilder.Parser; -using Ocelot.Library.Responses; +using Ocelot.Configuration; +using Ocelot.HeaderBuilder.Parser; +using Ocelot.Responses; -namespace Ocelot.Library.HeaderBuilder +namespace Ocelot.HeaderBuilder { public class AddHeadersToRequest : IAddHeadersToRequest { diff --git a/src/Ocelot/HeaderBuilder/IAddHeadersToRequest.cs b/src/Ocelot/HeaderBuilder/IAddHeadersToRequest.cs index c958f199..3c5cf49c 100644 --- a/src/Ocelot/HeaderBuilder/IAddHeadersToRequest.cs +++ b/src/Ocelot/HeaderBuilder/IAddHeadersToRequest.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Configuration; -using Ocelot.Library.Responses; +using Ocelot.Configuration; +using Ocelot.Responses; -namespace Ocelot.Library.HeaderBuilder +namespace Ocelot.HeaderBuilder { public interface IAddHeadersToRequest { diff --git a/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs b/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs index 001a424b..a718a7ba 100644 --- a/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs +++ b/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.Middleware; -using Ocelot.Library.ScopedData; +using Ocelot.DownstreamRouteFinder; +using Ocelot.Middleware; +using Ocelot.ScopedData; -namespace Ocelot.Library.HeaderBuilder.Middleware +namespace Ocelot.HeaderBuilder.Middleware { public class HttpRequestHeadersBuilderMiddleware : OcelotMiddleware { diff --git a/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs b/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs index acb1cd28..9b58408a 100644 --- a/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs +++ b/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; -namespace Ocelot.Library.HeaderBuilder.Middleware +namespace Ocelot.HeaderBuilder.Middleware { public static class HttpRequestHeadersBuilderMiddlewareExtensions { diff --git a/src/Ocelot/HeaderBuilder/Parser/CannotFindClaimError.cs b/src/Ocelot/HeaderBuilder/Parser/CannotFindClaimError.cs index f3270269..88f79075 100644 --- a/src/Ocelot/HeaderBuilder/Parser/CannotFindClaimError.cs +++ b/src/Ocelot/HeaderBuilder/Parser/CannotFindClaimError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.HeaderBuilder.Parser +namespace Ocelot.HeaderBuilder.Parser { public class CannotFindClaimError : Error { diff --git a/src/Ocelot/HeaderBuilder/Parser/ClaimsParser.cs b/src/Ocelot/HeaderBuilder/Parser/ClaimsParser.cs index 5ef6eab6..c54653b1 100644 --- a/src/Ocelot/HeaderBuilder/Parser/ClaimsParser.cs +++ b/src/Ocelot/HeaderBuilder/Parser/ClaimsParser.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; -using Ocelot.Library.Errors; -using Ocelot.Library.Responses; +using Ocelot.Errors; +using Ocelot.Responses; -namespace Ocelot.Library.HeaderBuilder.Parser +namespace Ocelot.HeaderBuilder.Parser { public class ClaimsParser : IClaimsParser { diff --git a/src/Ocelot/HeaderBuilder/Parser/IClaimsParser.cs b/src/Ocelot/HeaderBuilder/Parser/IClaimsParser.cs index 7f662d59..7e563be8 100644 --- a/src/Ocelot/HeaderBuilder/Parser/IClaimsParser.cs +++ b/src/Ocelot/HeaderBuilder/Parser/IClaimsParser.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Security.Claims; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.HeaderBuilder.Parser +namespace Ocelot.HeaderBuilder.Parser { public interface IClaimsParser { diff --git a/src/Ocelot/Middleware/OcelotMiddleware.cs b/src/Ocelot/Middleware/OcelotMiddleware.cs index eeccc65e..729493ce 100644 --- a/src/Ocelot/Middleware/OcelotMiddleware.cs +++ b/src/Ocelot/Middleware/OcelotMiddleware.cs @@ -1,10 +1,9 @@ -using Ocelot.Library.ScopedData; +using System.Collections.Generic; +using Ocelot.Errors; +using Ocelot.ScopedData; -namespace Ocelot.Library.Middleware +namespace Ocelot.Middleware { - using System.Collections.Generic; - using Errors; - public abstract class OcelotMiddleware { private readonly IScopedRequestDataRepository _scopedRequestDataRepository; diff --git a/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs b/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs index 3fb320bd..148dc8fe 100644 --- a/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs +++ b/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs @@ -1,15 +1,14 @@ -using Ocelot.Library.Authentication.Middleware; -using Ocelot.Library.DownstreamRouteFinder.Middleware; -using Ocelot.Library.DownstreamUrlCreator.Middleware; -using Ocelot.Library.HeaderBuilder.Middleware; -using Ocelot.Library.RequestBuilder.Middleware; -using Ocelot.Library.Requester.Middleware; -using Ocelot.Library.Responder.Middleware; +using Microsoft.AspNetCore.Builder; +using Ocelot.Authentication.Middleware; +using Ocelot.DownstreamRouteFinder.Middleware; +using Ocelot.DownstreamUrlCreator.Middleware; +using Ocelot.HeaderBuilder.Middleware; +using Ocelot.RequestBuilder.Middleware; +using Ocelot.Requester.Middleware; +using Ocelot.Responder.Middleware; -namespace Ocelot.Library.Middleware +namespace Ocelot.Middleware { - using Microsoft.AspNetCore.Builder; - public static class OcelotMiddlewareExtensions { public static IApplicationBuilder UseOcelot(this IApplicationBuilder builder) diff --git a/src/Ocelot/Middleware/UnauthenticatedError.cs b/src/Ocelot/Middleware/UnauthenticatedError.cs index a8e29033..c8b04039 100644 --- a/src/Ocelot/Middleware/UnauthenticatedError.cs +++ b/src/Ocelot/Middleware/UnauthenticatedError.cs @@ -1,7 +1,7 @@ -namespace Ocelot.Library.Middleware -{ - using Errors; +using Ocelot.Errors; +namespace Ocelot.Middleware +{ public class UnauthenticatedError : Error { public UnauthenticatedError(string message) : base(message, OcelotErrorCode.UnauthenticatedError) diff --git a/src/Ocelot/Properties/AssemblyInfo.cs b/src/Ocelot/Properties/AssemblyInfo.cs index cf59e825..ad12027e 100644 --- a/src/Ocelot/Properties/AssemblyInfo.cs +++ b/src/Ocelot/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; // associated with an assembly. [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Ocelot.Library")] +[assembly: AssemblyProduct("Ocelot")] [assembly: AssemblyTrademark("")] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/src/Ocelot/RequestBuilder/Builder/HttpRequestBuilder.cs b/src/Ocelot/RequestBuilder/Builder/HttpRequestBuilder.cs index b1846e6e..bda2914d 100644 --- a/src/Ocelot/RequestBuilder/Builder/HttpRequestBuilder.cs +++ b/src/Ocelot/RequestBuilder/Builder/HttpRequestBuilder.cs @@ -5,9 +5,9 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.RequestBuilder.Builder +namespace Ocelot.RequestBuilder.Builder { public class HttpRequestBuilder : IRequestBuilder { diff --git a/src/Ocelot/RequestBuilder/Builder/IRequestBuilder.cs b/src/Ocelot/RequestBuilder/Builder/IRequestBuilder.cs index a2c51eb5..7ab5c20b 100644 --- a/src/Ocelot/RequestBuilder/Builder/IRequestBuilder.cs +++ b/src/Ocelot/RequestBuilder/Builder/IRequestBuilder.cs @@ -1,9 +1,9 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.RequestBuilder.Builder +namespace Ocelot.RequestBuilder.Builder { public interface IRequestBuilder { diff --git a/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs b/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs index 3d3be229..3c21413f 100644 --- a/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs +++ b/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Middleware; -using Ocelot.Library.RequestBuilder.Builder; -using Ocelot.Library.ScopedData; +using Ocelot.Middleware; +using Ocelot.RequestBuilder.Builder; +using Ocelot.ScopedData; -namespace Ocelot.Library.RequestBuilder.Middleware +namespace Ocelot.RequestBuilder.Middleware { public class HttpRequestBuilderMiddleware : OcelotMiddleware { diff --git a/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs b/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs index b82d437e..3a4c6b26 100644 --- a/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs +++ b/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; -namespace Ocelot.Library.RequestBuilder.Middleware +namespace Ocelot.RequestBuilder.Middleware { public static class HttpRequestBuilderMiddlewareExtensions { diff --git a/src/Ocelot/RequestBuilder/Request.cs b/src/Ocelot/RequestBuilder/Request.cs index dae1243d..99149497 100644 --- a/src/Ocelot/RequestBuilder/Request.cs +++ b/src/Ocelot/RequestBuilder/Request.cs @@ -1,8 +1,8 @@ -namespace Ocelot.Library.RequestBuilder -{ - using System.Net; - using System.Net.Http; +using System.Net; +using System.Net.Http; +namespace Ocelot.RequestBuilder +{ public class Request { public Request(HttpRequestMessage httpRequestMessage, CookieContainer cookieContainer) diff --git a/src/Ocelot/Requester/HttpClientHttpRequester.cs b/src/Ocelot/Requester/HttpClientHttpRequester.cs index 534244b3..19b3b6fd 100644 --- a/src/Ocelot/Requester/HttpClientHttpRequester.cs +++ b/src/Ocelot/Requester/HttpClientHttpRequester.cs @@ -1,13 +1,13 @@ -namespace Ocelot.Library.Requester -{ - using System; - using System.Collections.Generic; - using System.Net.Http; - using System.Threading.Tasks; - using Errors; - using RequestBuilder; - using Responses; +using System; +using System.Collections.Generic; +using System.Net.Http; +using System.Threading.Tasks; +using Ocelot.Errors; +using Ocelot.RequestBuilder; +using Ocelot.Responses; +namespace Ocelot.Requester +{ public class HttpClientHttpRequester : IHttpRequester { public async Task> GetResponse(Request request) diff --git a/src/Ocelot/Requester/IHttpRequester.cs b/src/Ocelot/Requester/IHttpRequester.cs index 8b195fe8..6072b0e5 100644 --- a/src/Ocelot/Requester/IHttpRequester.cs +++ b/src/Ocelot/Requester/IHttpRequester.cs @@ -1,10 +1,10 @@ -namespace Ocelot.Library.Requester -{ - using System.Net.Http; - using System.Threading.Tasks; - using RequestBuilder; - using Responses; +using System.Net.Http; +using System.Threading.Tasks; +using Ocelot.RequestBuilder; +using Ocelot.Responses; +namespace Ocelot.Requester +{ public interface IHttpRequester { Task> GetResponse(Request request); diff --git a/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs b/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs index b24995f4..31f3ea86 100644 --- a/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs +++ b/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Middleware; -using Ocelot.Library.RequestBuilder; -using Ocelot.Library.ScopedData; +using Ocelot.Middleware; +using Ocelot.RequestBuilder; +using Ocelot.ScopedData; -namespace Ocelot.Library.Requester.Middleware +namespace Ocelot.Requester.Middleware { public class HttpRequesterMiddleware : OcelotMiddleware { diff --git a/src/Ocelot/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs b/src/Ocelot/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs index 73af0cd2..6a3d5bb8 100644 --- a/src/Ocelot/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs +++ b/src/Ocelot/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; -namespace Ocelot.Library.Requester.Middleware +namespace Ocelot.Requester.Middleware { public static class HttpRequesterMiddlewareExtensions { diff --git a/src/Ocelot/Requester/UnableToCompleteRequestError.cs b/src/Ocelot/Requester/UnableToCompleteRequestError.cs index 33d3d18e..d085cd1c 100644 --- a/src/Ocelot/Requester/UnableToCompleteRequestError.cs +++ b/src/Ocelot/Requester/UnableToCompleteRequestError.cs @@ -1,8 +1,8 @@ -namespace Ocelot.Library.Requester -{ - using System; - using Errors; +using System; +using Ocelot.Errors; +namespace Ocelot.Requester +{ public class UnableToCompleteRequestError : Error { public UnableToCompleteRequestError(Exception exception) diff --git a/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs b/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs index 902c5ac8..d7ab7090 100644 --- a/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs +++ b/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs @@ -1,10 +1,10 @@ -namespace Ocelot.Library.Responder -{ - using System.Collections.Generic; - using System.Linq; - using Errors; - using Responses; +using System.Collections.Generic; +using System.Linq; +using Ocelot.Errors; +using Ocelot.Responses; +namespace Ocelot.Responder +{ public class ErrorsToHttpStatusCodeMapper : IErrorsToHttpStatusCodeMapper { public Response Map(List errors) diff --git a/src/Ocelot/Responder/HttpContextResponder.cs b/src/Ocelot/Responder/HttpContextResponder.cs index d092d36a..46779deb 100644 --- a/src/Ocelot/Responder/HttpContextResponder.cs +++ b/src/Ocelot/Responder/HttpContextResponder.cs @@ -1,9 +1,9 @@ -namespace Ocelot.Library.Responder -{ - using System.Net.Http; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Http; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +namespace Ocelot.Responder +{ /// /// Cannot unit test things in this class due to methods not being implemented /// on .net concretes used for testing diff --git a/src/Ocelot/Responder/IErrorsToHttpStatusCodeMapper.cs b/src/Ocelot/Responder/IErrorsToHttpStatusCodeMapper.cs index 507b4b24..b4b610d9 100644 --- a/src/Ocelot/Responder/IErrorsToHttpStatusCodeMapper.cs +++ b/src/Ocelot/Responder/IErrorsToHttpStatusCodeMapper.cs @@ -1,9 +1,9 @@ -namespace Ocelot.Library.Responder -{ - using System.Collections.Generic; - using Errors; - using Responses; +using System.Collections.Generic; +using Ocelot.Errors; +using Ocelot.Responses; +namespace Ocelot.Responder +{ public interface IErrorsToHttpStatusCodeMapper { Response Map(List errors); diff --git a/src/Ocelot/Responder/IHttpResponder.cs b/src/Ocelot/Responder/IHttpResponder.cs index 972bb70a..4cf6d1b2 100644 --- a/src/Ocelot/Responder/IHttpResponder.cs +++ b/src/Ocelot/Responder/IHttpResponder.cs @@ -1,9 +1,9 @@ -namespace Ocelot.Library.Responder -{ - using System.Net.Http; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Http; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +namespace Ocelot.Responder +{ public interface IHttpResponder { Task CreateResponse(HttpContext context, HttpResponseMessage response); diff --git a/src/Ocelot/Responder/Middleware/HttpResponderMiddleware.cs b/src/Ocelot/Responder/Middleware/HttpResponderMiddleware.cs index b822d6b7..a9223a5f 100644 --- a/src/Ocelot/Responder/Middleware/HttpResponderMiddleware.cs +++ b/src/Ocelot/Responder/Middleware/HttpResponderMiddleware.cs @@ -1,10 +1,10 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Middleware; -using Ocelot.Library.ScopedData; +using Ocelot.Middleware; +using Ocelot.ScopedData; -namespace Ocelot.Library.Responder.Middleware +namespace Ocelot.Responder.Middleware { public class HttpResponderMiddleware : OcelotMiddleware { diff --git a/src/Ocelot/Responder/Middleware/HttpResponderMiddlewareExtensions.cs b/src/Ocelot/Responder/Middleware/HttpResponderMiddlewareExtensions.cs index 7ef7db83..3739efbd 100644 --- a/src/Ocelot/Responder/Middleware/HttpResponderMiddlewareExtensions.cs +++ b/src/Ocelot/Responder/Middleware/HttpResponderMiddlewareExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; -namespace Ocelot.Library.Responder.Middleware +namespace Ocelot.Responder.Middleware { public static class HttpResponderMiddlewareExtensions { diff --git a/src/Ocelot/Responses/ErrorResponse.cs b/src/Ocelot/Responses/ErrorResponse.cs index b097d961..9f541507 100644 --- a/src/Ocelot/Responses/ErrorResponse.cs +++ b/src/Ocelot/Responses/ErrorResponse.cs @@ -1,8 +1,8 @@ -namespace Ocelot.Library.Responses -{ - using System.Collections.Generic; - using Errors; +using System.Collections.Generic; +using Ocelot.Errors; +namespace Ocelot.Responses +{ public class ErrorResponse : Response { public ErrorResponse(List errors) : base(errors) diff --git a/src/Ocelot/Responses/ErrorResponseGeneric.cs b/src/Ocelot/Responses/ErrorResponseGeneric.cs index c5f8ef0b..77230503 100644 --- a/src/Ocelot/Responses/ErrorResponseGeneric.cs +++ b/src/Ocelot/Responses/ErrorResponseGeneric.cs @@ -1,8 +1,8 @@ -namespace Ocelot.Library.Responses -{ - using System.Collections.Generic; - using Errors; +using System.Collections.Generic; +using Ocelot.Errors; +namespace Ocelot.Responses +{ public class ErrorResponse : Response { public ErrorResponse(List errors) : base(errors) diff --git a/src/Ocelot/Responses/OkResponse.cs b/src/Ocelot/Responses/OkResponse.cs index 457afced..541d3061 100644 --- a/src/Ocelot/Responses/OkResponse.cs +++ b/src/Ocelot/Responses/OkResponse.cs @@ -1,4 +1,4 @@ -namespace Ocelot.Library.Responses +namespace Ocelot.Responses { public class OkResponse : Response { diff --git a/src/Ocelot/Responses/OkResponseGeneric.cs b/src/Ocelot/Responses/OkResponseGeneric.cs index d768f62f..c979dc91 100644 --- a/src/Ocelot/Responses/OkResponseGeneric.cs +++ b/src/Ocelot/Responses/OkResponseGeneric.cs @@ -1,4 +1,4 @@ -namespace Ocelot.Library.Responses +namespace Ocelot.Responses { public class OkResponse : Response { diff --git a/src/Ocelot/Responses/Response.cs b/src/Ocelot/Responses/Response.cs index c5628ac4..32ff9902 100644 --- a/src/Ocelot/Responses/Response.cs +++ b/src/Ocelot/Responses/Response.cs @@ -1,8 +1,8 @@ -namespace Ocelot.Library.Responses -{ - using System.Collections.Generic; - using Errors; +using System.Collections.Generic; +using Ocelot.Errors; +namespace Ocelot.Responses +{ public abstract class Response { protected Response() diff --git a/src/Ocelot/Responses/ResponseGeneric.cs b/src/Ocelot/Responses/ResponseGeneric.cs index bcebf865..1902b3e1 100644 --- a/src/Ocelot/Responses/ResponseGeneric.cs +++ b/src/Ocelot/Responses/ResponseGeneric.cs @@ -1,8 +1,8 @@ -namespace Ocelot.Library.Responses -{ - using System.Collections.Generic; - using Errors; +using System.Collections.Generic; +using Ocelot.Errors; +namespace Ocelot.Responses +{ public abstract class Response : Response { protected Response(T data) diff --git a/src/Ocelot/ScopedData/CannotAddDataError.cs b/src/Ocelot/ScopedData/CannotAddDataError.cs index bcdd5c28..bc5925e3 100644 --- a/src/Ocelot/ScopedData/CannotAddDataError.cs +++ b/src/Ocelot/ScopedData/CannotAddDataError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.ScopedData +namespace Ocelot.ScopedData { public class CannotAddDataError : Error { diff --git a/src/Ocelot/ScopedData/CannotFindDataError.cs b/src/Ocelot/ScopedData/CannotFindDataError.cs index 9daedcd4..97ae1540 100644 --- a/src/Ocelot/ScopedData/CannotFindDataError.cs +++ b/src/Ocelot/ScopedData/CannotFindDataError.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Errors; +using Ocelot.Errors; -namespace Ocelot.Library.ScopedData +namespace Ocelot.ScopedData { public class CannotFindDataError : Error { diff --git a/src/Ocelot/ScopedData/IScopedRequestDataRepository.cs b/src/Ocelot/ScopedData/IScopedRequestDataRepository.cs index 852a6121..76630395 100644 --- a/src/Ocelot/ScopedData/IScopedRequestDataRepository.cs +++ b/src/Ocelot/ScopedData/IScopedRequestDataRepository.cs @@ -1,6 +1,6 @@ -using Ocelot.Library.Responses; +using Ocelot.Responses; -namespace Ocelot.Library.ScopedData +namespace Ocelot.ScopedData { public interface IScopedRequestDataRepository { diff --git a/src/Ocelot/ScopedData/ScopedRequestDataRepository.cs b/src/Ocelot/ScopedData/ScopedRequestDataRepository.cs index 928e1ebb..98e22f68 100644 --- a/src/Ocelot/ScopedData/ScopedRequestDataRepository.cs +++ b/src/Ocelot/ScopedData/ScopedRequestDataRepository.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Http; -using Ocelot.Library.Errors; -using Ocelot.Library.Responses; +using Ocelot.Errors; +using Ocelot.Responses; -namespace Ocelot.Library.ScopedData +namespace Ocelot.ScopedData { public class ScopedRequestDataRepository : IScopedRequestDataRepository { diff --git a/test/Ocelot.AcceptanceTests/AuthenticationTests.cs b/test/Ocelot.AcceptanceTests/AuthenticationTests.cs index ab202d70..18f138d3 100644 --- a/test/Ocelot.AcceptanceTests/AuthenticationTests.cs +++ b/test/Ocelot.AcceptanceTests/AuthenticationTests.cs @@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; +using Ocelot.Configuration.Yaml; using Ocelot.ManualTest; using Shouldly; using TestStack.BDDfy; @@ -22,7 +23,6 @@ using YamlDotNet.Serialization; namespace Ocelot.AcceptanceTests { using System.Security.Claims; - using Library.Configuration.Yaml; public class AuthenticationTests : IDisposable { diff --git a/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs b/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs index 44c79872..aea7ec07 100644 --- a/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs +++ b/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; -using Ocelot.Library.Configuration.Yaml; +using Ocelot.Configuration.Yaml; using Ocelot.ManualTest; using Shouldly; using TestStack.BDDfy; diff --git a/test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs b/test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs index 43dbbdb2..c358e884 100644 --- a/test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs +++ b/test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs @@ -6,7 +6,7 @@ using System.Net.Http; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; -using Ocelot.Library.Configuration.Yaml; +using Ocelot.Configuration.Yaml; using Ocelot.ManualTest; using Shouldly; using TestStack.BDDfy; diff --git a/test/Ocelot.AcceptanceTests/RoutingTests.cs b/test/Ocelot.AcceptanceTests/RoutingTests.cs index 42b9fea5..bef6e1b7 100644 --- a/test/Ocelot.AcceptanceTests/RoutingTests.cs +++ b/test/Ocelot.AcceptanceTests/RoutingTests.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; +using Ocelot.Configuration.Yaml; using Ocelot.ManualTest; using Shouldly; using TestStack.BDDfy; @@ -15,8 +16,6 @@ using YamlDotNet.Serialization; namespace Ocelot.AcceptanceTests { - using Library.Configuration.Yaml; - public class RoutingTests : IDisposable { private TestServer _server; diff --git a/test/Ocelot.ManualTest/Startup.cs b/test/Ocelot.ManualTest/Startup.cs index c8d12f85..8eb7cf9f 100644 --- a/test/Ocelot.ManualTest/Startup.cs +++ b/test/Ocelot.ManualTest/Startup.cs @@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Ocelot.Library.DependencyInjection; -using Ocelot.Library.Middleware; +using Ocelot.DependencyInjection; +using Ocelot.Middleware; namespace Ocelot.ManualTest { diff --git a/test/Ocelot.UnitTests/Authentication/AuthenticationHandlerFactoryTests.cs b/test/Ocelot.UnitTests/Authentication/AuthenticationHandlerFactoryTests.cs index 483857c8..e76a2b28 100644 --- a/test/Ocelot.UnitTests/Authentication/AuthenticationHandlerFactoryTests.cs +++ b/test/Ocelot.UnitTests/Authentication/AuthenticationHandlerFactoryTests.cs @@ -3,20 +3,18 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Moq; -using Ocelot.Library.Authentication.Handler; -using Ocelot.Library.Authentication.Handler.Creator; -using Ocelot.Library.Authentication.Handler.Factory; +using Ocelot.Authentication.Handler; +using Ocelot.Authentication.Handler.Creator; +using Ocelot.Authentication.Handler.Factory; +using Ocelot.Errors; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; +using AuthenticationOptions = Ocelot.Configuration.AuthenticationOptions; namespace Ocelot.UnitTests.Authentication { - using Library.Authentication; - using Library.Configuration; - using Library.Errors; - using Library.Responses; - public class AuthenticationHandlerFactoryTests { private readonly IAuthenticationHandlerFactory _authenticationHandlerFactory; diff --git a/test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs b/test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs index 89b84a1e..d8ca67ad 100644 --- a/test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs @@ -6,13 +6,13 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Moq; -using Ocelot.Library.Authentication.Handler.Factory; -using Ocelot.Library.Authentication.Middleware; -using Ocelot.Library.Configuration.Builder; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.Responses; -using Ocelot.Library.ScopedData; +using Ocelot.Authentication.Handler.Factory; +using Ocelot.Authentication.Middleware; +using Ocelot.Configuration.Builder; +using Ocelot.DownstreamRouteFinder; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.Responses; +using Ocelot.ScopedData; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/Configuration/ConfigurationHeadersExtractorTests.cs b/test/Ocelot.UnitTests/Configuration/ConfigurationHeadersExtractorTests.cs index 29f674be..7b2f37c1 100644 --- a/test/Ocelot.UnitTests/Configuration/ConfigurationHeadersExtractorTests.cs +++ b/test/Ocelot.UnitTests/Configuration/ConfigurationHeadersExtractorTests.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; -using Ocelot.Library.Configuration; -using Ocelot.Library.Configuration.Parser; -using Ocelot.Library.Errors; -using Ocelot.Library.Responses; +using Ocelot.Configuration; +using Ocelot.Configuration.Parser; +using Ocelot.Errors; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/Configuration/ConfigurationValidationTests.cs b/test/Ocelot.UnitTests/Configuration/ConfigurationValidationTests.cs index a9395a93..98c45104 100644 --- a/test/Ocelot.UnitTests/Configuration/ConfigurationValidationTests.cs +++ b/test/Ocelot.UnitTests/Configuration/ConfigurationValidationTests.cs @@ -1,14 +1,13 @@ using System.Collections.Generic; -using Ocelot.Library.Configuration.Validator; +using Ocelot.Configuration.Validator; +using Ocelot.Configuration.Yaml; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; namespace Ocelot.UnitTests.Configuration { - using Library.Configuration.Yaml; - using Library.Responses; - public class ConfigurationValidationTests { private YamlConfiguration _yamlConfiguration; diff --git a/test/Ocelot.UnitTests/Configuration/InMemoryConfigurationRepositoryTests.cs b/test/Ocelot.UnitTests/Configuration/InMemoryConfigurationRepositoryTests.cs index c46942da..8c1cce52 100644 --- a/test/Ocelot.UnitTests/Configuration/InMemoryConfigurationRepositoryTests.cs +++ b/test/Ocelot.UnitTests/Configuration/InMemoryConfigurationRepositoryTests.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Ocelot.Library.Configuration; -using Ocelot.Library.Configuration.Builder; -using Ocelot.Library.Configuration.Repository; -using Ocelot.Library.Responses; +using Ocelot.Configuration; +using Ocelot.Configuration.Builder; +using Ocelot.Configuration.Repository; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/Configuration/YamlConfigurationCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/YamlConfigurationCreatorTests.cs index 102b0eae..fd69ba5e 100644 --- a/test/Ocelot.UnitTests/Configuration/YamlConfigurationCreatorTests.cs +++ b/test/Ocelot.UnitTests/Configuration/YamlConfigurationCreatorTests.cs @@ -2,22 +2,19 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; -using Ocelot.Library.Configuration.Builder; -using Ocelot.Library.Configuration.Creator; -using Ocelot.Library.Configuration.Parser; -using Ocelot.Library.Configuration.Repository; -using Ocelot.Library.Configuration.Validator; -using Ocelot.Library.RequestBuilder; +using Ocelot.Configuration; +using Ocelot.Configuration.Builder; +using Ocelot.Configuration.Creator; +using Ocelot.Configuration.Parser; +using Ocelot.Configuration.Validator; +using Ocelot.Configuration.Yaml; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; namespace Ocelot.UnitTests.Configuration { - using Library.Configuration; - using Library.Configuration.Yaml; - using Library.Responses; - public class YamlConfigurationCreatorTests { private readonly Mock> _yamlConfig; diff --git a/test/Ocelot.UnitTests/Configuration/YamlConfigurationProviderTests.cs b/test/Ocelot.UnitTests/Configuration/YamlConfigurationProviderTests.cs index ae81c4f7..8beaf159 100644 --- a/test/Ocelot.UnitTests/Configuration/YamlConfigurationProviderTests.cs +++ b/test/Ocelot.UnitTests/Configuration/YamlConfigurationProviderTests.cs @@ -3,13 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Moq; -using Ocelot.Library.Configuration; -using Ocelot.Library.Configuration.Creator; -using Ocelot.Library.Configuration.Provider; -using Ocelot.Library.Configuration.Repository; -using Ocelot.Library.Configuration.Yaml; -using Ocelot.Library.Errors; -using Ocelot.Library.Responses; +using Ocelot.Configuration; +using Ocelot.Configuration.Creator; +using Ocelot.Configuration.Provider; +using Ocelot.Configuration.Repository; +using Ocelot.Errors; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs b/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs index f3ab97cb..b932539a 100644 --- a/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs @@ -6,13 +6,13 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Moq; -using Ocelot.Library.Configuration.Builder; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.DownstreamRouteFinder.Finder; -using Ocelot.Library.DownstreamRouteFinder.Middleware; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.Responses; -using Ocelot.Library.ScopedData; +using Ocelot.Configuration.Builder; +using Ocelot.DownstreamRouteFinder; +using Ocelot.DownstreamRouteFinder.Finder; +using Ocelot.DownstreamRouteFinder.Middleware; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.Responses; +using Ocelot.ScopedData; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderTests.cs b/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderTests.cs index 8ea8e581..8f4b57aa 100644 --- a/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderTests.cs +++ b/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderTests.cs @@ -1,19 +1,18 @@ using System.Collections.Generic; using Moq; -using Ocelot.Library.Configuration.Builder; -using Ocelot.Library.Configuration.Provider; -using Ocelot.Library.DownstreamRouteFinder.Finder; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; +using Ocelot.Configuration; +using Ocelot.Configuration.Builder; +using Ocelot.Configuration.Provider; +using Ocelot.DownstreamRouteFinder; +using Ocelot.DownstreamRouteFinder.Finder; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; namespace Ocelot.UnitTests.DownstreamRouteFinder { - using Library.Configuration; - using Library.DownstreamRouteFinder; - using Library.Responses; - public class DownstreamRouteFinderTests { private readonly IDownstreamRouteFinder _downstreamRouteFinder; @@ -31,7 +30,7 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder _mockConfig = new Mock(); _mockMatcher = new Mock(); _finder = new Mock(); - _downstreamRouteFinder = new Library.DownstreamRouteFinder.Finder.DownstreamRouteFinder(_mockConfig.Object, _mockMatcher.Object, _finder.Object); + _downstreamRouteFinder = new Ocelot.DownstreamRouteFinder.Finder.DownstreamRouteFinder(_mockConfig.Object, _mockMatcher.Object, _finder.Object); } [Fact] diff --git a/test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcherTests.cs b/test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcherTests.cs index 0b0c8b50..02e8eb91 100644 --- a/test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcherTests.cs +++ b/test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcherTests.cs @@ -1,5 +1,5 @@ -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.Responses; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinderTests.cs b/test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinderTests.cs index 800f2024..bab6ef7e 100644 --- a/test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinderTests.cs +++ b/test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinderTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.Responses; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs b/test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs index 5ba07e06..959e46c5 100644 --- a/test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs @@ -6,13 +6,13 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Moq; -using Ocelot.Library.Configuration.Builder; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.DownstreamUrlCreator.Middleware; -using Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer; -using Ocelot.Library.Responses; -using Ocelot.Library.ScopedData; +using Ocelot.Configuration.Builder; +using Ocelot.DownstreamRouteFinder; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.DownstreamUrlCreator.Middleware; +using Ocelot.DownstreamUrlCreator.UrlTemplateReplacer; +using Ocelot.Responses; +using Ocelot.ScopedData; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/DownstreamUrlCreator/UrlTemplateReplacer/UpstreamUrlPathTemplateVariableReplacerTests.cs b/test/Ocelot.UnitTests/DownstreamUrlCreator/UrlTemplateReplacer/UpstreamUrlPathTemplateVariableReplacerTests.cs index c842a223..4bc8f19f 100644 --- a/test/Ocelot.UnitTests/DownstreamUrlCreator/UrlTemplateReplacer/UpstreamUrlPathTemplateVariableReplacerTests.cs +++ b/test/Ocelot.UnitTests/DownstreamUrlCreator/UrlTemplateReplacer/UpstreamUrlPathTemplateVariableReplacerTests.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Ocelot.Library.Configuration.Builder; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer; -using Ocelot.Library.Responses; +using Ocelot.Configuration.Builder; +using Ocelot.DownstreamRouteFinder; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.DownstreamUrlCreator.UrlTemplateReplacer; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/HeaderBuilder/AddHeadersToRequestTests.cs b/test/Ocelot.UnitTests/HeaderBuilder/AddHeadersToRequestTests.cs index 2e277823..7834558f 100644 --- a/test/Ocelot.UnitTests/HeaderBuilder/AddHeadersToRequestTests.cs +++ b/test/Ocelot.UnitTests/HeaderBuilder/AddHeadersToRequestTests.cs @@ -4,11 +4,11 @@ using System.Security.Claims; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; using Moq; -using Ocelot.Library.Configuration; -using Ocelot.Library.Errors; -using Ocelot.Library.HeaderBuilder; -using Ocelot.Library.HeaderBuilder.Parser; -using Ocelot.Library.Responses; +using Ocelot.Configuration; +using Ocelot.Errors; +using Ocelot.HeaderBuilder; +using Ocelot.HeaderBuilder.Parser; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/HeaderBuilder/ClaimParserTests.cs b/test/Ocelot.UnitTests/HeaderBuilder/ClaimParserTests.cs index 7be9226b..7b12f150 100644 --- a/test/Ocelot.UnitTests/HeaderBuilder/ClaimParserTests.cs +++ b/test/Ocelot.UnitTests/HeaderBuilder/ClaimParserTests.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Security.Claims; -using Ocelot.Library.Errors; -using Ocelot.Library.HeaderBuilder.Parser; -using Ocelot.Library.Responses; +using Ocelot.Errors; +using Ocelot.HeaderBuilder.Parser; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/HeaderBuilder/HttpRequestHeadersBuilderMiddlewareTests.cs b/test/Ocelot.UnitTests/HeaderBuilder/HttpRequestHeadersBuilderMiddlewareTests.cs index d7ab00b6..8fbd7993 100644 --- a/test/Ocelot.UnitTests/HeaderBuilder/HttpRequestHeadersBuilderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/HeaderBuilder/HttpRequestHeadersBuilderMiddlewareTests.cs @@ -7,14 +7,14 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Moq; -using Ocelot.Library.Configuration; -using Ocelot.Library.Configuration.Builder; -using Ocelot.Library.DownstreamRouteFinder; -using Ocelot.Library.DownstreamRouteFinder.UrlMatcher; -using Ocelot.Library.HeaderBuilder; -using Ocelot.Library.HeaderBuilder.Middleware; -using Ocelot.Library.Responses; -using Ocelot.Library.ScopedData; +using Ocelot.Configuration; +using Ocelot.Configuration.Builder; +using Ocelot.DownstreamRouteFinder; +using Ocelot.DownstreamRouteFinder.UrlMatcher; +using Ocelot.HeaderBuilder; +using Ocelot.HeaderBuilder.Middleware; +using Ocelot.Responses; +using Ocelot.ScopedData; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/Repository/ScopedRequestDataRepositoryTests.cs b/test/Ocelot.UnitTests/Repository/ScopedRequestDataRepositoryTests.cs index 53e573ad..196b6a92 100644 --- a/test/Ocelot.UnitTests/Repository/ScopedRequestDataRepositoryTests.cs +++ b/test/Ocelot.UnitTests/Repository/ScopedRequestDataRepositoryTests.cs @@ -1,13 +1,12 @@ using Microsoft.AspNetCore.Http; -using Ocelot.Library.ScopedData; +using Ocelot.Responses; +using Ocelot.ScopedData; using Shouldly; using TestStack.BDDfy; using Xunit; namespace Ocelot.UnitTests.Repository { - using Library.Responses; - public class ScopedRequestDataRepositoryTests { private IScopedRequestDataRepository _scopedRequestDataRepository; diff --git a/test/Ocelot.UnitTests/RequestBuilder/HttpRequestBuilderMiddlewareTests.cs b/test/Ocelot.UnitTests/RequestBuilder/HttpRequestBuilderMiddlewareTests.cs index 03a3d9a1..d7683445 100644 --- a/test/Ocelot.UnitTests/RequestBuilder/HttpRequestBuilderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/RequestBuilder/HttpRequestBuilderMiddlewareTests.cs @@ -7,11 +7,11 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Moq; -using Ocelot.Library.RequestBuilder; -using Ocelot.Library.RequestBuilder.Builder; -using Ocelot.Library.RequestBuilder.Middleware; -using Ocelot.Library.Responses; -using Ocelot.Library.ScopedData; +using Ocelot.RequestBuilder; +using Ocelot.RequestBuilder.Builder; +using Ocelot.RequestBuilder.Middleware; +using Ocelot.Responses; +using Ocelot.ScopedData; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/RequestBuilder/RequestBuilderTests.cs b/test/Ocelot.UnitTests/RequestBuilder/RequestBuilderTests.cs index 224f9624..d7945136 100644 --- a/test/Ocelot.UnitTests/RequestBuilder/RequestBuilderTests.cs +++ b/test/Ocelot.UnitTests/RequestBuilder/RequestBuilderTests.cs @@ -5,16 +5,15 @@ using System.Net; using System.Net.Http; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Internal; -using Ocelot.Library.RequestBuilder.Builder; +using Ocelot.RequestBuilder; +using Ocelot.RequestBuilder.Builder; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; namespace Ocelot.UnitTests.RequestBuilder { - using Library.RequestBuilder; - using Library.Responses; - public class RequestBuilderTests { private string _httpMethod; diff --git a/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs b/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs index 2c7bdb8b..34d73b64 100644 --- a/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs @@ -6,11 +6,11 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Moq; -using Ocelot.Library.RequestBuilder; -using Ocelot.Library.Requester; -using Ocelot.Library.Requester.Middleware; -using Ocelot.Library.Responses; -using Ocelot.Library.ScopedData; +using Ocelot.RequestBuilder; +using Ocelot.Requester; +using Ocelot.Requester.Middleware; +using Ocelot.Responses; +using Ocelot.ScopedData; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs b/test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs index fdd48842..78f78235 100644 --- a/test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs +++ b/test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs @@ -2,17 +2,16 @@ using System.IO; using System.Net.Http; using Microsoft.AspNetCore.Http; +using Ocelot.Errors; +using Ocelot.Middleware; +using Ocelot.Responder; +using Ocelot.Responses; using Shouldly; using TestStack.BDDfy; using Xunit; namespace Ocelot.UnitTests.Responder { - using Library.Errors; - using Library.Middleware; - using Library.Responder; - using Library.Responses; - public class ErrorsToHttpStatusCodeMapperTests { private readonly IErrorsToHttpStatusCodeMapper _codeMapper; diff --git a/test/Ocelot.UnitTests/Responder/HttpResponderMiddlewareTests.cs b/test/Ocelot.UnitTests/Responder/HttpResponderMiddlewareTests.cs index b8c3c5eb..0a24907a 100644 --- a/test/Ocelot.UnitTests/Responder/HttpResponderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Responder/HttpResponderMiddlewareTests.cs @@ -6,10 +6,10 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Moq; -using Ocelot.Library.Responder; -using Ocelot.Library.Responder.Middleware; -using Ocelot.Library.Responses; -using Ocelot.Library.ScopedData; +using Ocelot.Responder; +using Ocelot.Responder.Middleware; +using Ocelot.Responses; +using Ocelot.ScopedData; using TestStack.BDDfy; using Xunit;