From 878eacf1dba1fc6eb1dc5c1d634839b67aaf4721 Mon Sep 17 00:00:00 2001 From: Philip Wood Date: Tue, 18 Apr 2017 15:35:54 +0100 Subject: [PATCH] Remove obsolete code --- src/Ocelot/Headers/AddHeadersToRequest.cs | 24 --- src/Ocelot/Headers/IAddHeadersToRequest.cs | 17 +- .../HttpRequestHeadersBuilderMiddleware.cs | 1 - .../Middleware/LoadBalancingMiddleware.cs | 1 - .../QueryStrings/AddQueriesToRequest.cs | 43 ---- .../QueryStrings/IAddQueriesToRequest.cs | 3 - .../QueryStringBuilderMiddleware.cs | 1 - src/Ocelot/Request/Builder/IRequestCreator.cs | 25 +-- src/Ocelot/Request/Builder/RequestBuilder.cs | 191 ------------------ .../Headers/AddHeadersToRequestTests.cs | 3 - ...ttpRequestHeadersBuilderMiddlewareTests.cs | 2 + .../LoadBalancerMiddlewareTests.cs | 1 - .../QueryStrings/AddQueriesToRequestTests.cs | 2 - .../HttpRequestBuilderMiddlewareTests.cs | 5 +- 14 files changed, 17 insertions(+), 302 deletions(-) delete mode 100644 src/Ocelot/Request/Builder/RequestBuilder.cs diff --git a/src/Ocelot/Headers/AddHeadersToRequest.cs b/src/Ocelot/Headers/AddHeadersToRequest.cs index 791860b5..3c818bcc 100644 --- a/src/Ocelot/Headers/AddHeadersToRequest.cs +++ b/src/Ocelot/Headers/AddHeadersToRequest.cs @@ -16,30 +16,6 @@ namespace Ocelot.Headers _claimsParser = claimsParser; } - //public Response SetHeadersOnContext(List claimsToThings, HttpContext context) - //{ - // foreach (var config in claimsToThings) - // { - // var value = _claimsParser.GetValue(context.User.Claims, config.NewKey, config.Delimiter, config.Index); - - // if (value.IsError) - // { - // return new ErrorResponse(value.Errors); - // } - - // var exists = context.Request.Headers.FirstOrDefault(x => x.Key == config.ExistingKey); - - // if (!string.IsNullOrEmpty(exists.Key)) - // { - // context.Request.Headers.Remove(exists); - // } - - // context.Request.Headers.Add(config.ExistingKey, new StringValues(value.Data)); - // } - - // return new OkResponse(); - //} - public Response SetHeadersOnDownstreamRequest(List claimsToThings, IEnumerable claims, HttpRequestMessage downstreamRequest) { foreach (var config in claimsToThings) diff --git a/src/Ocelot/Headers/IAddHeadersToRequest.cs b/src/Ocelot/Headers/IAddHeadersToRequest.cs index a819bbf1..cc4e0383 100644 --- a/src/Ocelot/Headers/IAddHeadersToRequest.cs +++ b/src/Ocelot/Headers/IAddHeadersToRequest.cs @@ -1,16 +1,13 @@ -using System.Collections.Generic; -using Microsoft.AspNetCore.Http; -using Ocelot.Configuration; -using Ocelot.Responses; -using System.Net.Http; - -namespace Ocelot.Headers +namespace Ocelot.Headers { + using System.Collections.Generic; + using System.Net.Http; + + using Ocelot.Configuration; + using Ocelot.Responses; + public interface IAddHeadersToRequest { - //Response SetHeadersOnContext(List claimsToThings, - // HttpContext context); - Response SetHeadersOnDownstreamRequest(List claimsToThings, IEnumerable claims, HttpRequestMessage downstreamRequest); } } diff --git a/src/Ocelot/Headers/Middleware/HttpRequestHeadersBuilderMiddleware.cs b/src/Ocelot/Headers/Middleware/HttpRequestHeadersBuilderMiddleware.cs index 380fcc7d..cb0fdc98 100644 --- a/src/Ocelot/Headers/Middleware/HttpRequestHeadersBuilderMiddleware.cs +++ b/src/Ocelot/Headers/Middleware/HttpRequestHeadersBuilderMiddleware.cs @@ -32,7 +32,6 @@ namespace Ocelot.Headers.Middleware { _logger.LogDebug("this route has instructions to convert claims to headers"); - //var response = _addHeadersToRequest.SetHeadersOnContext(DownstreamRoute.ReRoute.ClaimsToHeaders, context); var response = _addHeadersToRequest.SetHeadersOnDownstreamRequest(DownstreamRoute.ReRoute.ClaimsToHeaders, context.User.Claims, DownstreamRequest); if (response.IsError) diff --git a/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs b/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs index d74759e9..be5a34d1 100644 --- a/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs +++ b/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs @@ -44,7 +44,6 @@ namespace Ocelot.LoadBalancer.Middleware return; } - //SetHostAndPortForThisRequest(hostAndPort.Data); var uriBuilder = new UriBuilder(DownstreamRequest.RequestUri); uriBuilder.Host = hostAndPort.Data.DownstreamHost; if (hostAndPort.Data.DownstreamPort > 0) diff --git a/src/Ocelot/QueryStrings/AddQueriesToRequest.cs b/src/Ocelot/QueryStrings/AddQueriesToRequest.cs index 0c099271..839da9bc 100644 --- a/src/Ocelot/QueryStrings/AddQueriesToRequest.cs +++ b/src/Ocelot/QueryStrings/AddQueriesToRequest.cs @@ -19,36 +19,6 @@ namespace Ocelot.QueryStrings _claimsParser = claimsParser; } - //public Response SetQueriesOnContext(List claimsToThings, HttpContext context) - //{ - // var queryDictionary = ConvertQueryStringToDictionary(context.Request.QueryString); - - // foreach (var config in claimsToThings) - // { - // var value = _claimsParser.GetValue(context.User.Claims, config.NewKey, config.Delimiter, config.Index); - - // if (value.IsError) - // { - // return new ErrorResponse(value.Errors); - // } - - // var exists = queryDictionary.FirstOrDefault(x => x.Key == config.ExistingKey); - - // if (!string.IsNullOrEmpty(exists.Key)) - // { - // queryDictionary[exists.Key] = value.Data; - // } - // else - // { - // queryDictionary.Add(config.ExistingKey, value.Data); - // } - // } - - // context.Request.QueryString = ConvertDictionaryToQueryString(queryDictionary); - - // return new OkResponse(); - //} - public Response SetQueriesOnDownstreamRequest(List claimsToThings, IEnumerable claims, HttpRequestMessage downstreamRequest) { var queryDictionary = ConvertQueryStringToDictionary(downstreamRequest.RequestUri.Query); @@ -82,12 +52,6 @@ namespace Ocelot.QueryStrings return new OkResponse(); } - //private Dictionary ConvertQueryStringToDictionary(HttpContext context) - //{ - // return Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(context.Request.QueryString.Value) - // .ToDictionary(q => q.Key, q => q.Value.FirstOrDefault() ?? string.Empty); - //} - private Dictionary ConvertQueryStringToDictionary(string queryString) { return Microsoft.AspNetCore.WebUtilities.QueryHelpers @@ -95,13 +59,6 @@ namespace Ocelot.QueryStrings .ToDictionary(q => q.Key, q => q.Value.FirstOrDefault() ?? string.Empty); } - //private Microsoft.AspNetCore.Http.QueryString ConvertDictionaryToQueryString(Dictionary queryDictionary) - //{ - // var newQueryString = Microsoft.AspNetCore.WebUtilities.QueryHelpers.AddQueryString("", queryDictionary); - - // return new Microsoft.AspNetCore.Http.QueryString(newQueryString); - //} - private string ConvertDictionaryToQueryString(Dictionary queryDictionary) { return Microsoft.AspNetCore.WebUtilities.QueryHelpers.AddQueryString("", queryDictionary); diff --git a/src/Ocelot/QueryStrings/IAddQueriesToRequest.cs b/src/Ocelot/QueryStrings/IAddQueriesToRequest.cs index 606732c6..762b8a00 100644 --- a/src/Ocelot/QueryStrings/IAddQueriesToRequest.cs +++ b/src/Ocelot/QueryStrings/IAddQueriesToRequest.cs @@ -9,9 +9,6 @@ namespace Ocelot.QueryStrings { public interface IAddQueriesToRequest { - //Response SetQueriesOnContext(List claimsToThings, - // HttpContext context); - Response SetQueriesOnDownstreamRequest(List claimsToThings, IEnumerable claims, HttpRequestMessage downstreamRequest); } } diff --git a/src/Ocelot/QueryStrings/Middleware/QueryStringBuilderMiddleware.cs b/src/Ocelot/QueryStrings/Middleware/QueryStringBuilderMiddleware.cs index 80db18b4..f3001e87 100644 --- a/src/Ocelot/QueryStrings/Middleware/QueryStringBuilderMiddleware.cs +++ b/src/Ocelot/QueryStrings/Middleware/QueryStringBuilderMiddleware.cs @@ -32,7 +32,6 @@ namespace Ocelot.QueryStrings.Middleware { _logger.LogDebug("this route has instructions to convert claims to queries"); - //var response = _addQueriesToRequest.SetQueriesOnContext(DownstreamRoute.ReRoute.ClaimsToQueries, context); var response = _addQueriesToRequest.SetQueriesOnDownstreamRequest(DownstreamRoute.ReRoute.ClaimsToQueries, context.User.Claims, DownstreamRequest); if (response.IsError) diff --git a/src/Ocelot/Request/Builder/IRequestCreator.cs b/src/Ocelot/Request/Builder/IRequestCreator.cs index d4eae34f..85fbfa8d 100644 --- a/src/Ocelot/Request/Builder/IRequestCreator.cs +++ b/src/Ocelot/Request/Builder/IRequestCreator.cs @@ -1,24 +1,13 @@ -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Ocelot.Requester.QoS; -using Ocelot.Responses; -using System.Net.Http; - -namespace Ocelot.Request.Builder +namespace Ocelot.Request.Builder { + using System.Net.Http; + using System.Threading.Tasks; + + using Ocelot.Requester.QoS; + using Ocelot.Responses; + public interface IRequestCreator { - //Task> Build(string httpMethod, - // string downstreamUrl, - // Stream content, - // IHeaderDictionary headers, - // QueryString queryString, - // string contentType, - // RequestId.RequestId requestId, - // bool isQos, - // IQoSProvider qosProvider); - Task> Build( HttpRequestMessage httpRequestMessage, bool isQos, diff --git a/src/Ocelot/Request/Builder/RequestBuilder.cs b/src/Ocelot/Request/Builder/RequestBuilder.cs deleted file mode 100644 index a76391df..00000000 --- a/src/Ocelot/Request/Builder/RequestBuilder.cs +++ /dev/null @@ -1,191 +0,0 @@ -//using System; -//using System.Collections.Generic; -//using System.IO; -//using System.Linq; -//using System.Net; -//using System.Net.Http; -//using System.Net.Http.Headers; -//using System.Threading.Tasks; -//using Microsoft.AspNetCore.Http; -//using Microsoft.Extensions.Primitives; -//using Ocelot.Requester.QoS; - -//namespace Ocelot.Request.Builder -//{ -// internal sealed class RequestBuilder -// { -// private HttpMethod _method; -// private string _downstreamUrl; -// private QueryString _queryString; -// private Stream _content; -// private string _contentType; -// private IHeaderDictionary _headers; -// private RequestId.RequestId _requestId; -// private readonly string[] _unsupportedHeaders = {"host"}; -// private bool _isQos; -// private IQoSProvider _qoSProvider; - -// ---- sets Method - -// public RequestBuilder WithHttpMethod(string httpMethod) -// { -// _method = new HttpMethod(httpMethod); -// return this; -// } - -// ---- sets RequestUri - -// public RequestBuilder WithDownstreamUrl(string downstreamUrl) -// { -// _downstreamUrl = downstreamUrl; -// return this; -// } - -// public RequestBuilder WithQueryString(QueryString queryString) -// { -// _queryString = queryString; -// return this; -// } - -// private Uri CreateUri() -// { -// var uri = new Uri(string.Format("{0}{1}", _downstreamUrl, _queryString.ToUriComponent())); -// return uri; -// } - -// ---- Content and ContentType - -// public RequestBuilder WithContent(Stream content) -// { -// _content = content; -// return this; -// } - -// public RequestBuilder WithContentType(string contentType) -// { -// _contentType = contentType; -// return this; -// } - -// private async Task AddContentToRequest(HttpRequestMessage httpRequestMessage) -// { -// if (_content != null) -// { -// httpRequestMessage.Content = new ByteArrayContent(await ToByteArray(_content)); -// } -// } - -// private async Task ToByteArray(Stream stream) -// { -// using (stream) -// { -// using (var memStream = new MemoryStream()) -// { -// await stream.CopyToAsync(memStream); -// return memStream.ToArray(); -// } -// } -// } - -// private void AddContentTypeToRequest(HttpRequestMessage httpRequestMessage) -// { -// if (!string.IsNullOrEmpty(_contentType)) -// { -// httpRequestMessage.Content.Headers.Remove("Content-Type"); -// httpRequestMessage.Content.Headers.TryAddWithoutValidation("Content-Type", _contentType); -// } -// } - -// ---- Headers - -// public RequestBuilder WithHeaders(IHeaderDictionary headers) -// { -// _headers = headers; -// return this; -// } - -// private void AddHeadersToRequest(HttpRequestMessage httpRequestMessage) -// { -// if (_headers != null) -// { -// _headers.Remove("Content-Type"); - -// foreach (var header in _headers) -// { -// //todo get rid of if.. -// if (IsSupportedHeader(header)) -// { -// httpRequestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray()); -// } -// } -// } -// } - -// private bool IsSupportedHeader(KeyValuePair header) -// { -// return !_unsupportedHeaders.Contains(header.Key.ToLower()); -// } - -// ---- Request ID - -// public RequestBuilder WithRequestId(RequestId.RequestId requestId) -// { -// _requestId = requestId; -// return this; -// } - -// private void AddRequestIdHeader(RequestId.RequestId requestId, HttpRequestMessage httpRequestMessage) -// { -// httpRequestMessage.Headers.Add(requestId.RequestIdKey, requestId.RequestIdValue); -// } - -// private bool RequestIdInHeaders(RequestId.RequestId requestId, HttpRequestHeaders headers) -// { -// IEnumerable value; -// return headers.TryGetValues(requestId.RequestIdKey, out value); -// } - -// private bool ShouldAddRequestId(RequestId.RequestId requestId, HttpRequestHeaders headers) -// { -// return !string.IsNullOrEmpty(requestId?.RequestIdKey) -// && !string.IsNullOrEmpty(requestId.RequestIdValue) -// && !RequestIdInHeaders(requestId, headers); -// } - -// ---- QoS - -// public RequestBuilder WithIsQos(bool isqos) -// { -// _isQos = isqos; -// return this; -// } - -// public RequestBuilder WithQos(IQoSProvider qoSProvider) -// { -// _qoSProvider = qoSProvider; -// return this; -// } - -// ---- - -// public async Task Build() -// { -// var uri = CreateUri(); - -// var httpRequestMessage = new HttpRequestMessage(_method, uri); - -// await AddContentToRequest(httpRequestMessage); - -// AddContentTypeToRequest(httpRequestMessage); - -// AddHeadersToRequest(httpRequestMessage); - -// if (ShouldAddRequestId(_requestId, httpRequestMessage.Headers)) -// { -// AddRequestIdHeader(_requestId, httpRequestMessage); -// } - -// return new Request(httpRequestMessage,_isQos, _qoSProvider); -// } -// } -//} diff --git a/test/Ocelot.UnitTests/Headers/AddHeadersToRequestTests.cs b/test/Ocelot.UnitTests/Headers/AddHeadersToRequestTests.cs index 0395df91..d276fd24 100644 --- a/test/Ocelot.UnitTests/Headers/AddHeadersToRequestTests.cs +++ b/test/Ocelot.UnitTests/Headers/AddHeadersToRequestTests.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Primitives; using Moq; using Ocelot.Configuration; using Ocelot.Errors; @@ -23,7 +21,6 @@ namespace Ocelot.UnitTests.Headers private readonly HttpRequestMessage _downstreamRequest; private List _claims; private List _configuration; - private HttpContext _context; private Response _result; private Response _claimValue; diff --git a/test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs b/test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs index d6a49dc5..95989688 100644 --- a/test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs @@ -56,6 +56,8 @@ namespace Ocelot.UnitTests.Headers app.UseHttpRequestHeadersBuilderMiddleware(); }); + _downstreamRequest = new HttpRequestMessage(); + _scopedRepository .Setup(sr => sr.Get("DownstreamRequest")) .Returns(new OkResponse(_downstreamRequest)); diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs index c3607e82..a7dfd1ac 100644 --- a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs @@ -30,7 +30,6 @@ namespace Ocelot.UnitTests.LoadBalancer private readonly HttpClient _client; private HttpResponseMessage _result; private HostAndPort _hostAndPort; - private OkResponse _downstreamUrl; private OkResponse _downstreamRoute; private ErrorResponse _getLoadBalancerHouseError; private ErrorResponse _getHostAndPortError; diff --git a/test/Ocelot.UnitTests/QueryStrings/AddQueriesToRequestTests.cs b/test/Ocelot.UnitTests/QueryStrings/AddQueriesToRequestTests.cs index b65ce531..ee7769a5 100644 --- a/test/Ocelot.UnitTests/QueryStrings/AddQueriesToRequestTests.cs +++ b/test/Ocelot.UnitTests/QueryStrings/AddQueriesToRequestTests.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; -using Microsoft.AspNetCore.Http; using Moq; using Ocelot.Configuration; using Ocelot.Errors; @@ -144,7 +143,6 @@ namespace Ocelot.UnitTests.QueryStrings private void ThenTheResultIsError() { - _result.IsError.ShouldBe(true); } diff --git a/test/Ocelot.UnitTests/Request/HttpRequestBuilderMiddlewareTests.cs b/test/Ocelot.UnitTests/Request/HttpRequestBuilderMiddlewareTests.cs index 8c2a0879..8cec477e 100644 --- a/test/Ocelot.UnitTests/Request/HttpRequestBuilderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Request/HttpRequestBuilderMiddlewareTests.cs @@ -106,10 +106,7 @@ namespace Ocelot.UnitTests.Request private void GivenTheRequestBuilderReturns(Ocelot.Request.Request request) { _request = new OkResponse(request); - //_requestBuilder - // .Setup(x => x.Build(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), - // It.IsAny(), It.IsAny(), It.IsAny(),It.IsAny(), It.IsAny())) - // .ReturnsAsync(_request); + _requestBuilder .Setup(x => x.Build(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(_request);