some tidying up and a bit of refactoring...not too happy about how the proxy is working at the moment! May need a rethink!

src/Ocelot.Library/Infrastructure/Configuration/ConfigurationValidationResult.cs

@@ -1,11 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using Ocelot.Library.Infrastructure.Responses;
 
 namespace Ocelot.Library.Infrastructure.Configuration
 {
     public class ConfigurationValidationResult
     {
+        public ConfigurationValidationResult(bool isError)
+        {
+            IsError = isError;
+            Errors = new List<Error>();
+        }
+
+        public ConfigurationValidationResult(bool isError, List<Error> errors)
+        {
+            IsError = isError;
+            Errors = errors;
+        }
+
+        public bool IsError { get; private set; }
+
+        public List<Error> Errors { get; private set; } 
     }
 }

src/Ocelot.Library/Infrastructure/Configuration/ConfigurationValidator.cs

@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Ocelot.Library.Infrastructure.Responses;
 
 namespace Ocelot.Library.Infrastructure.Configuration
@@ -19,7 +17,7 @@ namespace Ocelot.Library.Infrastructure.Configuration
 
             if (duplicateUpstreamTemplates.Count <= 0)
             {
-                return new OkResponse<ConfigurationValidationResult>(new ConfigurationValidationResult());
+                return new OkResponse<ConfigurationValidationResult>(new ConfigurationValidationResult(false));
             }
                 
             var errors = new List<Error>();
@@ -31,7 +29,7 @@ namespace Ocelot.Library.Infrastructure.Configuration
                 errors.Add(error);
             }
 
-            return new ErrorResponse<ConfigurationValidationResult>(errors);
+            return new OkResponse<ConfigurationValidationResult>(new ConfigurationValidationResult(true, errors));
         }
     }
 }

src/Ocelot.Library/Infrastructure/DownstreamRouteFinder/DownstreamRouteFinder.cs

@@ -18,7 +18,6 @@ namespace Ocelot.Library.Infrastructure.DownstreamRouteFinder
 
         public Response<DownstreamRoute> FindDownstreamRoute(string upstreamUrlPath)
         {
-
             foreach (var template in _configuration.Value.ReRoutes)
             {
                 var urlMatch = _urlMatcher.Match(upstreamUrlPath, template.UpstreamTemplate);

src/Ocelot.Library/Infrastructure/Requester/HttpClientHttpRequester.cs

@@ -0,0 +1,21 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace Ocelot.Library.Infrastructure.Requester
+{
+    public class HttpClientHttpRequester : IHttpRequester
+    {
+        public async Task<HttpResponseMessage> GetResponse(string httpMethod, string downstreamUrl)
+        {
+            var method = new HttpMethod(httpMethod);
+
+            var httpRequestMessage = new HttpRequestMessage(method, downstreamUrl);
+
+            using (var httpClient = new HttpClient())
+            {
+                var response = await httpClient.SendAsync(httpRequestMessage);
+                return response;
+            }
+        }
+    }
+}

src/Ocelot.Library/Infrastructure/Requester/IHttpRequester.cs

@@ -0,0 +1,11 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using Flurl.Http;
+
+namespace Ocelot.Library.Infrastructure.Requester
+{
+    public interface IHttpRequester
+    {
+        Task<HttpResponseMessage> GetResponse(string httpMethod, string downstreamUrl);
+    }
+}

src/Ocelot.Library/Infrastructure/Responder/HttpContextResponder.cs

@@ -0,0 +1,27 @@
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Ocelot.Library.Infrastructure.Responder
+{
+    public class HttpContextResponder : IHttpResponder
+    {
+        public async Task<HttpContext> CreateSuccessResponse(HttpContext context, HttpResponseMessage response)
+        {
+            if (!response.IsSuccessStatusCode)
+            {
+                context.Response.StatusCode = (int)response.StatusCode;
+                return context;
+            }
+            await context.Response.WriteAsync(await response.Content.ReadAsStringAsync());
+            return context;
+        }
+
+        public async Task<HttpContext> CreateNotFoundResponse(HttpContext context)
+        {
+            context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+            return context;
+        }
+    }
+}

src/Ocelot.Library/Infrastructure/Responder/IHttpResponder.cs

@@ -0,0 +1,13 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Ocelot.Library.Infrastructure.Responder
+{
+    public interface IHttpResponder
+    {
+        Task<HttpContext> CreateSuccessResponse(HttpContext context, HttpResponseMessage response);
+        Task<HttpContext> CreateNotFoundResponse(HttpContext context);
+
+    }
+}

src/Ocelot.Library/Infrastructure/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs

@@ -5,7 +5,7 @@ namespace Ocelot.Library.Infrastructure.UrlTemplateReplacer
 {
     public class DownstreamUrlTemplateVariableReplacer : IDownstreamUrlTemplateVariableReplacer
     {
-        public string ReplaceTemplateVariable(DownstreamRoute downstreamRoute)
+        public string ReplaceTemplateVariables(DownstreamRoute downstreamRoute)
         {
             var upstreamUrl = new StringBuilder();
 

src/Ocelot.Library/Infrastructure/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs

@@ -5,6 +5,6 @@ namespace Ocelot.Library.Infrastructure.UrlTemplateReplacer
 {
     public interface IDownstreamUrlTemplateVariableReplacer
     {
-        string ReplaceTemplateVariable(DownstreamRoute downstreamRoute);   
+        string ReplaceTemplateVariables(DownstreamRoute downstreamRoute);   
     }
 }