Fix for #1277 - Add Options/Startup API for WebAPI shim

Adds an options class, as well as a default options setup that will
configure the default set of formatters.

Currently most of what options needs to do is a placeholder, but it later
do things like add ApplicationModelConventions, filters, formatters, model
binders, etc. Those will be added in follow up items.

Author: rynowak

src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptions.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Net.Http.Formatting;
+
+namespace Microsoft.AspNet.Mvc.WebApiCompatShim
+{
+    public class WebApiCompatShimOptions
+    {
+        public WebApiCompatShimOptions()
+        {
+            // Start with an empty collection, our options setup will add the default formatters.
+            Formatters = new MediaTypeFormatterCollection(Enumerable.Empty<MediaTypeFormatter>());
+        }
+
+        public MediaTypeFormatterCollection Formatters { get; set; }
+    }
+}

src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Net.Http.Formatting;
+using Microsoft.Framework.OptionsModel;
+
+namespace Microsoft.AspNet.Mvc.WebApiCompatShim
+{
+    public class WebApiCompatShimOptionsSetup : IOptionsAction<MvcOptions>, IOptionsAction<WebApiCompatShimOptions>
+    {
+        public int Order
+        {
+            // We want to run after the default MvcOptionsSetup.
+            get { return DefaultOrder.DefaultFrameworkSortOrder + 10; }
+        }
+
+        public string Name { get; set; }
+
+        public void Invoke(MvcOptions options)
+        {
+            // Placeholder
+        }
+
+        public void Invoke(WebApiCompatShimOptions options)
+        {
+            // Add the default formatters
+            options.Formatters.AddRange(new MediaTypeFormatterCollection());
+        }
+    }
+}

src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNet.Mvc.WebApiCompatShim;
+
+namespace Microsoft.Framework.DependencyInjection
+{
+    public static class WebApiCompatShimServiceCollectionExtensions
+    {
+        public static IServiceCollection AddWebApiConventions(this IServiceCollection services)
+        {
+            services.AddOptionsAction<WebApiCompatShimOptionsSetup>();
+            return services;
+        }
+    }
+}

test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs

@@ -8,6 +8,8 @@
 using Microsoft.AspNet.TestHost;
 using Xunit;
 using System.Net;
+using Newtonsoft.Json;
+using System.Net.Http.Formatting;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
@@ -23,8 +25,6 @@ public async Task ApiController_Activates_HttpContextAndUser()
             var server = TestServer.Create(_provider, _app);
             var client = server.CreateClient();
 
-           
-
             // Act
             var response = await client.GetAsync("http://localhost/BasicApi/WriteToHttpContext");
             var content = await response.Content.ReadAsStringAsync();
@@ -43,8 +43,6 @@ public async Task ApiController_Activates_UrlHelper()
             var server = TestServer.Create(_provider, _app);
             var client = server.CreateClient();
 
-
-
             // Act
             var response = await client.GetAsync("http://localhost/BasicApi/GenerateUrl");
             var content = await response.Content.ReadAsStringAsync();
@@ -55,6 +53,31 @@ public async Task ApiController_Activates_UrlHelper()
                 "Visited: /BasicApi/GenerateUrl",
                 content);
         }
+
+        [Fact]
+        public async Task Options_SetsDefaultFormatters()
+        {
+            // Arrange
+            var server = TestServer.Create(_provider, _app);
+            var client = server.CreateClient();
+
+            var expected = new string[]
+            {
+                typeof(JsonMediaTypeFormatter).FullName,
+                typeof(XmlMediaTypeFormatter).FullName,
+                typeof(FormUrlEncodedMediaTypeFormatter).FullName,
+            };
+
+            // Act
+            var response = await client.GetAsync("http://localhost/BasicApi/GetFormatters");
+            var content = await response.Content.ReadAsStringAsync();
+
+            var formatters = JsonConvert.DeserializeObject<string[]>(content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, formatters);
+        }
     }
 }
 #endif

test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs

@@ -1,15 +1,21 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Http;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.WebApiCompatShim;
+using Microsoft.Framework.OptionsModel;
 
 namespace WebApiCompatShimWebSite
 {
     public class BasicApiController : ApiController
     {
+        [Activate]
+        public IOptionsAccessor<WebApiCompatShimOptions> OptionsAccessor { get; set; }
+
         // Verifies property activation
         [HttpGet]
         public async Task<IActionResult> WriteToHttpContext()
@@ -32,5 +38,12 @@ public async Task<IActionResult> GenerateUrl()
             await Context.Response.WriteAsync(message);
             return new EmptyResult();
         }
+
+        // Verifies the default options configure formatters correctly.
+        [HttpGet]
+        public string[] GetFormatters()
+        {
+            return OptionsAccessor.Options.Formatters.Select(f => f.GetType().FullName).ToArray();
+        }
     }
 }

test/WebSites/WebApiCompatShimWebSite/Startup.cs

@@ -15,9 +15,9 @@ public void Configure(IApplicationBuilder app)
             app.UseServices(services =>
             {
                 services.AddMvc(configuration);
-            });
 
-            app.UseMvc();
+                services.AddWebApiConventions();
+            });
         }
     }
 }