Update examples with model binding

Chris Martinez · commonsensesoftware · commit 4e6f616a8254 · 2018-07-26T12:07:07.000-07:00
diff --git a/samples/aspnetcore/BasicSample/Controllers/HelloWorldController.cs b/samples/aspnetcore/BasicSample/Controllers/HelloWorldController.cs
@@ -15,11 +15,11 @@ public class HelloWorldController : Controller
     {
         // GET api/v{version}/helloworld
         [HttpGet]
-        public IActionResult Get() => Ok( new { Controller = GetType().Name, Version = HttpContext.GetRequestedApiVersion().ToString() } );
+        public IActionResult Get( ApiVersion apiVersion ) => Ok( new { Controller = GetType().Name, Version = apiVersion.ToString() } );
 
         // GET api/v{version}/helloworld/{id}
         [HttpGet( "{id:int}", Name = "GetMessageById" )]
-        public IActionResult Get( int id ) => Ok( new { Controller = GetType().Name, Id = id, Version = HttpContext.GetRequestedApiVersion().ToString() } );
+        public IActionResult Get( int id, ApiVersion apiVersion ) => Ok( new { Controller = GetType().Name, Id = id, Version = apiVersion.ToString() } );
 
         // POST api/v{version}/helloworld
         [HttpPost]
diff --git a/samples/aspnetcore/BasicSample/Controllers/ValuesController.cs b/samples/aspnetcore/BasicSample/Controllers/ValuesController.cs
@@ -12,6 +12,6 @@ public class ValuesController : Controller
     {
         // GET api/values?api-version=1.0
         [HttpGet]
-        public string Get() => $"Controller = {GetType().Name}\nVersion = {HttpContext.GetRequestedApiVersion()}";
+        public string Get( ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nVersion = {apiVersion}";
     }
 }
diff --git a/samples/aspnetcore/ByNamespaceSample/V1/Controllers/AgreementsController.cs b/samples/aspnetcore/ByNamespaceSample/V1/Controllers/AgreementsController.cs
@@ -10,6 +10,6 @@ public class AgreementsController : Controller
         // GET ~/v1/agreements/{accountId}
         // GET ~/agreements/{accountId}?api-version=1.0
         [HttpGet( "{accountId}" )]
-        public IActionResult Get( string accountId ) => Ok( new Agreement( GetType().FullName, accountId, HttpContext.GetRequestedApiVersion().ToString() ) );
+        public IActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Agreement( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/aspnetcore/ByNamespaceSample/V1/Controllers/OrdersController.cs b/samples/aspnetcore/ByNamespaceSample/V1/Controllers/OrdersController.cs
@@ -10,6 +10,6 @@ public class OrdersController : Controller
         // GET ~/v1/orders/{accountId}
         // GET ~/orders/{accountId}?api-version=1.0
         [HttpGet( "{accountId}" )]
-        public IActionResult Get( string accountId ) => Ok( new Order( GetType().FullName, accountId, HttpContext.GetRequestedApiVersion().ToString() ) );
+        public IActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Order( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/aspnetcore/ByNamespaceSample/V2/Controllers/AgreementsController.cs b/samples/aspnetcore/ByNamespaceSample/V2/Controllers/AgreementsController.cs
@@ -10,6 +10,6 @@ public class AgreementsController : Controller
         // GET ~/v2/agreements/{accountId}
         // GET ~/agreements/{accountId}?api-version=2.0
         [HttpGet( "{accountId}" )]
-        public IActionResult Get( string accountId ) => Ok( new Agreement( GetType().FullName, accountId, HttpContext.GetRequestedApiVersion().ToString() ) );
+        public IActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Agreement( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/aspnetcore/ByNamespaceSample/V2/Controllers/OrdersController.cs b/samples/aspnetcore/ByNamespaceSample/V2/Controllers/OrdersController.cs
@@ -10,6 +10,6 @@ public class OrdersController : Controller
         // GET ~/v2/orders/{accountId}
         // GET ~/orders/{accountId}?api-version=2.0
         [HttpGet( "{accountId}" )]
-        public IActionResult Get( string accountId ) => Ok( new Order( GetType().FullName, accountId, HttpContext.GetRequestedApiVersion().ToString() ) );
+        public IActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Order( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/aspnetcore/ByNamespaceSample/V3/Controllers/AgreementsController.cs b/samples/aspnetcore/ByNamespaceSample/V3/Controllers/AgreementsController.cs
@@ -10,6 +10,6 @@ public class AgreementsController : Controller
         // GET ~/v3/agreements/{accountId}
         // GET ~/agreements/{accountId}?api-version=3.0
         [HttpGet( "{accountId}" )]
-        public IActionResult Get( string accountId ) => Ok( new Agreement( GetType().FullName, accountId, HttpContext.GetRequestedApiVersion().ToString() ) );
+        public IActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Agreement( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/aspnetcore/ByNamespaceSample/V3/Controllers/OrdersController.cs b/samples/aspnetcore/ByNamespaceSample/V3/Controllers/OrdersController.cs
@@ -10,6 +10,6 @@ public class OrdersController : Controller
         // GET ~/v3/orders/{accountId}
         // GET ~/orders/{accountId}?api-version=3.0
         [HttpGet( "{accountId}" )]
-        public IActionResult Get( string accountId ) => Ok( new Order( GetType().FullName, accountId, HttpContext.GetRequestedApiVersion().ToString() ) );
+        public IActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Order( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/aspnetcore/ConventionsSample/Controllers/HelloWorldController.cs b/samples/aspnetcore/ConventionsSample/Controllers/HelloWorldController.cs
@@ -11,10 +11,10 @@ public class HelloWorldController : Controller
     {
         // GET api/v{version}/helloworld
         [HttpGet]
-        public string Get() => $"Controller = {GetType().Name}\nVersion = {HttpContext.GetRequestedApiVersion()}";
+        public string Get( ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nVersion = {apiVersion}";
 
         // GET api/v{version}/helloworld/{id}
         [HttpGet( "{id:int}" )]
-        public string Get( int id ) => $"Controller = {GetType().Name}\nId = {id}\nVersion = {HttpContext.GetRequestedApiVersion()}";
+        public string Get( int id, ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nId = {id}\nVersion = {apiVersion}";
     }
 }
diff --git a/samples/aspnetcore/ConventionsSample/Controllers/ValuesController.cs b/samples/aspnetcore/ConventionsSample/Controllers/ValuesController.cs
@@ -11,10 +11,10 @@ public class ValuesController : Controller
     {
         // GET api/values?api-version=1.0
         [HttpGet]
-        public string Get() => $"Controller = {GetType().Name}\nVersion = {HttpContext.GetRequestedApiVersion()}";
+        public string Get( ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nVersion = {apiVersion}";
 
         // GET api/values/{id}?api-version=1.0
         [HttpGet( "{id:int}" )]
-        public string Get( int id ) => $"Controller = {GetType().Name}\nId = {id}\nVersion = {HttpContext.GetRequestedApiVersion()}";
+        public string Get( int id, ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nId = {id}\nVersion = {apiVersion}";
     }
 }
diff --git a/samples/webapi/BasicWebApiSample/Controllers/HelloWorldController.cs b/samples/webapi/BasicWebApiSample/Controllers/HelloWorldController.cs
@@ -9,11 +9,11 @@ public class HelloWorldController : ApiController
     {
         // GET api/v{version}/helloworld
         [Route]
-        public IHttpActionResult Get() => Ok( new { controller = GetType().Name, version = Request.GetRequestedApiVersion().ToString() } );
+        public IHttpActionResult Get( ApiVersion apiVersion ) => Ok( new { controller = GetType().Name, version = apiVersion.ToString() } );
 
         // GET api/v{version}/helloworld/{id}
         [Route( "{id:int}", Name = "GetMessageById" )]
-        public IHttpActionResult Get( int id ) => Ok( new { controller = GetType().Name, id = id, version = Request.GetRequestedApiVersion().ToString() } );
+        public IHttpActionResult Get( int id, ApiVersion apiVersion ) => Ok( new { controller = GetType().Name, id = id, version = apiVersion.ToString() } );
 
         // POST api/v{version}/helloworld
         [Route]
diff --git a/samples/webapi/BasicWebApiSample/Controllers/ValuesController.cs b/samples/webapi/BasicWebApiSample/Controllers/ValuesController.cs
@@ -12,6 +12,6 @@
     public class ValuesController : ApiController
     {
         // GET api/values?api-version=1.0
-        public IHttpActionResult Get() => Ok( new { controller = GetType().Name, version = Request.GetRequestedApiVersion().ToString() } );
+        public IHttpActionResult Get( ApiVersion apiVersion ) => Ok( new { controller = GetType().Name, version = apiVersion.ToString() } );
     }
 }
diff --git a/samples/webapi/ByNamespaceWebApiSample/V1/Controllers/AgreementsController.cs b/samples/webapi/ByNamespaceWebApiSample/V1/Controllers/AgreementsController.cs
@@ -1,12 +1,13 @@
 ﻿namespace Microsoft.Examples.V1.Controllers
 {
+    using Microsoft.Web.Http;
     using Models;
     using System.Web.Http;
 
     public class AgreementsController : ApiController
     {
         // GET ~/v1/agreements/{accountId}
         // GET ~/agreements/{accountId}?api-version=1.0
-        public IHttpActionResult Get( string accountId ) => Ok( new Agreement( GetType().FullName, accountId, Request.GetRequestedApiVersion().ToString() ) );
+        public IHttpActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Agreement( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/webapi/ByNamespaceWebApiSample/V1/Controllers/OrdersController.cs b/samples/webapi/ByNamespaceWebApiSample/V1/Controllers/OrdersController.cs
@@ -1,5 +1,6 @@
 ﻿namespace Microsoft.Examples.V1.Controllers
 {
+    using Microsoft.Web.Http;
     using Models;
     using System.Web.Http;
 
@@ -8,6 +9,6 @@ public class OrdersController : ApiController
     {
         // GET ~/v1/orders/{accountId}
         [Route( "{accountId}" )]
-        public IHttpActionResult Get( string accountId ) => Ok( new Order( GetType().FullName, accountId, Request.GetRequestedApiVersion().ToString() ) );
+        public IHttpActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Order( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/webapi/ByNamespaceWebApiSample/V2/Controllers/AgreementsController.cs b/samples/webapi/ByNamespaceWebApiSample/V2/Controllers/AgreementsController.cs
@@ -1,12 +1,13 @@
 ﻿namespace Microsoft.Examples.V2.Controllers
 {
+    using Microsoft.Web.Http;
     using Models;
     using System.Web.Http;
 
     public class AgreementsController : ApiController
     {
         // GET ~/v2/agreements/{accountId}
         // GET ~/agreements/{accountId}?api-version=2.0
-        public IHttpActionResult Get( string accountId ) => Ok( new Agreement( GetType().FullName, accountId, Request.GetRequestedApiVersion().ToString() ) );
+        public IHttpActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Agreement( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/webapi/ByNamespaceWebApiSample/V2/Controllers/OrdersController.cs b/samples/webapi/ByNamespaceWebApiSample/V2/Controllers/OrdersController.cs
@@ -1,5 +1,6 @@
 ﻿namespace Microsoft.Examples.V2.Controllers
 {
+    using Microsoft.Web.Http;
     using Models;
     using System.Web.Http;
 
@@ -8,6 +9,6 @@ public class OrdersController : ApiController
     {
         // GET ~/v2/orders/{accountId}
         [Route( "{accountId}" )]
-        public IHttpActionResult Get( string accountId ) => Ok( new Order( GetType().FullName, accountId, Request.GetRequestedApiVersion().ToString() ) );
+        public IHttpActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Order( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/webapi/ByNamespaceWebApiSample/V3/Controllers/AgreementsController.cs b/samples/webapi/ByNamespaceWebApiSample/V3/Controllers/AgreementsController.cs
@@ -1,12 +1,13 @@
 ﻿namespace Microsoft.Examples.V3.Controllers
 {
+    using Microsoft.Web.Http;
     using Models;
     using System.Web.Http;
 
     public class AgreementsController : ApiController
     {
         // GET ~/v3/agreements/{accountId}
         // GET ~/agreements/{accountId}?api-version=3.0
-        public IHttpActionResult Get( string accountId ) => Ok( new Agreement( GetType().FullName, accountId, Request.GetRequestedApiVersion().ToString() ) );
+        public IHttpActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Agreement( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/webapi/ByNamespaceWebApiSample/V3/Controllers/OrdersController.cs b/samples/webapi/ByNamespaceWebApiSample/V3/Controllers/OrdersController.cs
@@ -1,5 +1,6 @@
 ﻿namespace Microsoft.Examples.V3.Controllers
 {
+    using Microsoft.Web.Http;
     using Models;
     using System.Web.Http;
 
@@ -8,6 +9,6 @@ public class OrdersController : ApiController
     {
         // GET ~/v3/orders/{accountId}
         [Route( "{accountId}" )]
-        public IHttpActionResult Get( string accountId ) => Ok( new Order( GetType().FullName, accountId, Request.GetRequestedApiVersion().ToString() ) );
+        public IHttpActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Order( GetType().FullName, accountId, apiVersion.ToString() ) );
     }
 }
diff --git a/samples/webapi/ConventionsWebApiSample/Controllers/HelloWorldController.cs b/samples/webapi/ConventionsWebApiSample/Controllers/HelloWorldController.cs
@@ -1,16 +1,17 @@
 ﻿namespace Microsoft.Examples.Controllers
 {
+    using Microsoft.Web.Http;
     using System.Web.Http;
 
     [RoutePrefix( "api/v{version:apiVersion}/helloworld" )]
     public class HelloWorldController : ApiController
     {
         // GET api/v{version}/helloworld
         [Route]
-        public IHttpActionResult Get() => Ok( new { controller = GetType().Name, version = Request.GetRequestedApiVersion().ToString() } );
+        public IHttpActionResult Get( ApiVersion apiVersion ) => Ok( new { controller = GetType().Name, version = apiVersion.ToString() } );
 
         // GET api/v{version}/helloworld/{id}
         [Route( "{id:int}" )]
-        public IHttpActionResult Get( int id ) => Ok( new { controller = GetType().Name, id = id, version = Request.GetRequestedApiVersion().ToString() } );
+        public IHttpActionResult Get( int id, ApiVersion apiVersion ) => Ok( new { controller = GetType().Name, id, version = apiVersion.ToString() } );
     }
 }
diff --git a/samples/webapi/ConventionsWebApiSample/Controllers/ValuesController.cs b/samples/webapi/ConventionsWebApiSample/Controllers/ValuesController.cs
@@ -1,16 +1,17 @@
 ﻿namespace Microsoft.Examples.Controllers
 {
+    using Microsoft.Web.Http;
     using System.Web.Http;
 
     [RoutePrefix( "api/values" )]
     public class ValuesController : ApiController
     {
         // GET api/values?api-version=1.0
         [Route]
-        public IHttpActionResult Get() => Ok( new { controller = GetType().Name, version = Request.GetRequestedApiVersion().ToString() } );
+        public IHttpActionResult Get( ApiVersion apiVersion ) => Ok( new { controller = GetType().Name, version = apiVersion.ToString() } );
 
         // GET api/values/{id}?api-version=1.0
         [Route( "{id:int}" )]
-        public IHttpActionResult Get( int id ) => Ok( new { controller = GetType().Name, id = id, version = Request.GetRequestedApiVersion().ToString() } );
+        public IHttpActionResult Get( int id, ApiVersion apiVersion ) => Ok( new { controller = GetType().Name, id, version = apiVersion.ToString() } );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public class ValuesController : Controller`
`12`	`12`	`{`
`13`	`13`	`// GET api/values?api-version=1.0`
`14`	`14`	`[HttpGet]`
`15`		`- public string Get() => $"Controller = {GetType().Name}\nVersion = {HttpContext.GetRequestedApiVersion()}";`
	`15`	`+ public string Get( ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nVersion = {apiVersion}";`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ public class AgreementsController : Controller`
`10`	`10`	`// GET ~/v1/agreements/{accountId}`
`11`	`11`	`// GET ~/agreements/{accountId}?api-version=1.0`
`12`	`12`	`[HttpGet( "{accountId}" )]`
`13`		`- public IActionResult Get( string accountId ) => Ok( new Agreement( GetType().FullName, accountId, HttpContext.GetRequestedApiVersion().ToString() ) );`
	`13`	`+ public IActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Agreement( GetType().FullName, accountId, apiVersion.ToString() ) );`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ public class OrdersController : Controller`
`10`	`10`	`// GET ~/v1/orders/{accountId}`
`11`	`11`	`// GET ~/orders/{accountId}?api-version=1.0`
`12`	`12`	`[HttpGet( "{accountId}" )]`
`13`		`- public IActionResult Get( string accountId ) => Ok( new Order( GetType().FullName, accountId, HttpContext.GetRequestedApiVersion().ToString() ) );`
	`13`	`+ public IActionResult Get( string accountId, ApiVersion apiVersion ) => Ok( new Order( GetType().FullName, accountId, apiVersion.ToString() ) );`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ public class HelloWorldController : Controller`
`11`	`11`	`{`
`12`	`12`	`// GET api/v{version}/helloworld`
`13`	`13`	`[HttpGet]`
`14`		`- public string Get() => $"Controller = {GetType().Name}\nVersion = {HttpContext.GetRequestedApiVersion()}";`
	`14`	`+ public string Get( ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nVersion = {apiVersion}";`
`15`	`15`
`16`	`16`	`// GET api/v{version}/helloworld/{id}`
`17`	`17`	`[HttpGet( "{id:int}" )]`
`18`		`- public string Get( int id ) => $"Controller = {GetType().Name}\nId = {id}\nVersion = {HttpContext.GetRequestedApiVersion()}";`
	`18`	`+ public string Get( int id, ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nId = {id}\nVersion = {apiVersion}";`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ public class ValuesController : Controller`
`11`	`11`	`{`
`12`	`12`	`// GET api/values?api-version=1.0`
`13`	`13`	`[HttpGet]`
`14`		`- public string Get() => $"Controller = {GetType().Name}\nVersion = {HttpContext.GetRequestedApiVersion()}";`
	`14`	`+ public string Get( ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nVersion = {apiVersion}";`
`15`	`15`
`16`	`16`	`// GET api/values/{id}?api-version=1.0`
`17`	`17`	`[HttpGet( "{id:int}" )]`
`18`		`- public string Get( int id ) => $"Controller = {GetType().Name}\nId = {id}\nVersion = {HttpContext.GetRequestedApiVersion()}";`
	`18`	`+ public string Get( int id, ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nId = {id}\nVersion = {apiVersion}";`
`19`	`19`	`}`
`20`	`20`	`}`