Merge branch 'user/carl-aggregate-methods' into develop

Cherry picked from ThreeMammals#1389

Author: stefancruz

docs/features/requestaggregation.rst

@@ -206,5 +206,6 @@ Gotcha's / Further info
 
 You cannot use Routes with specific RequestIdKeys as this would be crazy complicated to track.
 
-Aggregation only supports the GET HTTP Verb.
+Aggregation supports the GET HTTP Verb for pure REST, it supports other verbs for apis which do not fully follow REST.
+
 

src/Ocelot/Configuration/Creator/AggregatesCreator.cs

@@ -23,7 +23,13 @@ public List<Route> Create(FileConfiguration fileConfiguration, List<Route> route
         }
 
         private Route SetUpAggregateRoute(IEnumerable<Route> routes, FileAggregateRoute aggregateRoute, FileGlobalConfiguration globalConfiguration)
-        {
+        {
+            if (!aggregateRoute.UpstreamHttpMethod.Any())
+            {
+                // Default Method to Get for standard use case
+                aggregateRoute.UpstreamHttpMethod.Add("Get");
+            }
+
             var applicableRoutes = new List<DownstreamRoute>();
             var allRoutes = routes.SelectMany(x => x.DownstreamRoute);
 

src/Ocelot/Configuration/File/FileAggregateRoute.cs

@@ -3,19 +3,15 @@ namespace Ocelot.Configuration.File
     using System.Collections.Generic;
 
     public class FileAggregateRoute : IRoute
-    {
+    {
         public List<string> RouteKeys { get; set; }
         public List<AggregateRouteConfig> RouteKeysConfig { get; set; }
         public string UpstreamPathTemplate { get; set; }
         public string UpstreamHost { get; set; }
         public bool RouteIsCaseSensitive { get; set; }
         public string Aggregator { get; set; }
-
-        // Only supports GET..are you crazy!! POST, PUT WOULD BE CRAZY!! :)
         public List<string> UpstreamHttpMethod
-        {
-            get { return new List<string> { "Get" }; }
-        }
+        { get; private set; } = new List<string>();
 
         public int Priority { get; set; } = 1;
     }

test/Ocelot.AcceptanceTests/AggregateTests.cs

@@ -1,6 +1,7 @@
 namespace Ocelot.AcceptanceTests
 {
     using Microsoft.AspNetCore.Http;
+    using Newtonsoft.Json;
     using Ocelot.Configuration.File;
     using Ocelot.Middleware;
     using Ocelot.Multiplexer;
@@ -138,6 +139,20 @@ public void should_fix_issue_597()
                 .BDDfy();
         }
 
+        [Fact]
+        public void should_allow_get_method()
+        {
+            FileAggregateRoute route = JsonConvert.DeserializeObject<FileAggregateRoute>("{\"UpstreamHttpMethod\":[\"Get\"]}");
+            Assert.Contains("Get", route.UpstreamHttpMethod);
+        }
+
+        [Fact]
+        public void should_allow_post_method()
+        {
+            FileAggregateRoute route = JsonConvert.DeserializeObject<FileAggregateRoute>("{\"UpstreamHttpMethod\":[\"Post\"]}");
+            Assert.Contains("Post", route.UpstreamHttpMethod);
+        }
+
         [Fact]
         public void should_return_response_200_with_advanced_aggregate_configs()
         {