From ec622dc0add3474e3288c94a328652cbc9e71f8d Mon Sep 17 00:00:00 2001
From: Pitming <pm.pitming@gmail.com>
Date: Fri, 8 Nov 2019 13:08:01 +0100
Subject: [PATCH] Add DownstreamHttpMethodCreatorMiddleware

---
 .../Middleware/DownstreamMethodTransformerMiddleware.cs}  | 8 ++++----
 .../Middleware/Pipeline/OcelotPipelineExtensions.cs       | 4 ++++
 src/Ocelot/Request/Middleware/DownstreamRequest.cs        | 1 -
 .../Middleware/HttpRequestBuilderMiddlewareExtensions.cs  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename src/Ocelot/{DownstreamUrlCreator/Middleware/DownstreamHttpMethodCreatorMiddleware.cs => DownstreamMethodTransformer/Middleware/DownstreamMethodTransformerMiddleware.cs} (68%)

diff --git a/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamHttpMethodCreatorMiddleware.cs b/src/Ocelot/DownstreamMethodTransformer/Middleware/DownstreamMethodTransformerMiddleware.cs
similarity index 68%
rename from src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamHttpMethodCreatorMiddleware.cs
rename to src/Ocelot/DownstreamMethodTransformer/Middleware/DownstreamMethodTransformerMiddleware.cs
index 6689c0c1..a17e9167 100644
--- a/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamHttpMethodCreatorMiddleware.cs
+++ b/src/Ocelot/DownstreamMethodTransformer/Middleware/DownstreamMethodTransformerMiddleware.cs
@@ -2,14 +2,14 @@
 using Ocelot.Middleware;
 using System.Threading.Tasks;
 
-namespace Ocelot.DownstreamUrlCreator.Middleware
+namespace Ocelot.DownstreamMethodTransformer.Middleware
 {
-    public class DownstreamHttpMethodCreatorMiddleware : OcelotMiddleware
+    public class DownstreamMethodTransformerMiddleware : OcelotMiddleware
     {
         private readonly OcelotRequestDelegate _next;
 
-        public DownstreamHttpMethodCreatorMiddleware(OcelotRequestDelegate next, IOcelotLoggerFactory loggerFactory)
-            : base(loggerFactory.CreateLogger<DownstreamHttpMethodCreatorMiddleware>())
+        public DownstreamMethodTransformerMiddleware(OcelotRequestDelegate next, IOcelotLoggerFactory loggerFactory)
+            : base(loggerFactory.CreateLogger<DownstreamMethodTransformerMiddleware>())
         {
             _next = next;
         }
diff --git a/src/Ocelot/Middleware/Pipeline/OcelotPipelineExtensions.cs b/src/Ocelot/Middleware/Pipeline/OcelotPipelineExtensions.cs
index d52cfb0d..02ee07f4 100644
--- a/src/Ocelot/Middleware/Pipeline/OcelotPipelineExtensions.cs
+++ b/src/Ocelot/Middleware/Pipeline/OcelotPipelineExtensions.cs
@@ -2,6 +2,7 @@
 using Ocelot.Authorisation.Middleware;
 using Ocelot.Cache.Middleware;
 using Ocelot.Claims.Middleware;
+using Ocelot.DownstreamMethodTransformer.Middleware;
 using Ocelot.DownstreamRouteFinder.Middleware;
 using Ocelot.DownstreamUrlCreator.Middleware;
 using Ocelot.Errors.Middleware;
@@ -68,6 +69,9 @@ namespace Ocelot.Middleware.Pipeline
             // Initialises downstream request
             builder.UseDownstreamRequestInitialiser();
 
+            //change Http Method
+            builder.UseMiddleware<DownstreamMethodTransformerMiddleware>();
+
             // We check whether the request is ratelimit, and if there is no continue processing
             builder.UseRateLimiting();
 
diff --git a/src/Ocelot/Request/Middleware/DownstreamRequest.cs b/src/Ocelot/Request/Middleware/DownstreamRequest.cs
index 1715b387..24d96cfe 100644
--- a/src/Ocelot/Request/Middleware/DownstreamRequest.cs
+++ b/src/Ocelot/Request/Middleware/DownstreamRequest.cs
@@ -53,7 +53,6 @@ namespace Ocelot.Request.Middleware
 
             _request.RequestUri = uriBuilder.Uri;
             _request.Method = new HttpMethod(Method);
-            _request.Content = Content;
             return _request;
         }
 
diff --git a/src/Ocelot/Request/Middleware/HttpRequestBuilderMiddlewareExtensions.cs b/src/Ocelot/Request/Middleware/HttpRequestBuilderMiddlewareExtensions.cs
index 6c43507c..e6eff7e0 100644
--- a/src/Ocelot/Request/Middleware/HttpRequestBuilderMiddlewareExtensions.cs
+++ b/src/Ocelot/Request/Middleware/HttpRequestBuilderMiddlewareExtensions.cs
@@ -9,7 +9,7 @@ namespace Ocelot.Request.Middleware
         public static IOcelotPipelineBuilder UseDownstreamRequestInitialiser(this IOcelotPipelineBuilder builder)
         {
             return builder.UseMiddleware<DownstreamRequestInitialiserMiddleware>()
-                .UseMiddleware<DownstreamHttpMethodCreatorMiddleware>();
+                .UseMiddleware<DownstreamMethodTransformerMiddleware>();
         }
     }
 }