Update Odata sample with AspNetCoreOData 8.0.1

gustavnavar · Jul 16, 2021 · b8688b9 · b8688b9
1 parent 4e6b64b
commit b8688b9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 20 deletions.
diff --git a/GridBlazorOData.Server/Controllers/EmployeesController.cs b/GridBlazorOData.Server/Controllers/EmployeesController.cs
@@ -1,8 +1,8 @@
 using GridBlazorOData.Server.Models;
 using GridBlazorOData.Shared.Models;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Deltas;
 using Microsoft.AspNetCore.OData.Formatter;
-using Microsoft.AspNetCore.OData.Formatter.Value;
 using Microsoft.AspNetCore.OData.Query;
 using Microsoft.AspNetCore.OData.Routing.Controllers;
 using Microsoft.EntityFrameworkCore;

diff --git a/GridBlazorOData.Server/Controllers/OrderDetailsController.cs b/GridBlazorOData.Server/Controllers/OrderDetailsController.cs
@@ -1,8 +1,8 @@
 using GridBlazorOData.Server.Models;
 using GridBlazorOData.Shared.Models;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Deltas;
 using Microsoft.AspNetCore.OData.Formatter;
-using Microsoft.AspNetCore.OData.Formatter.Value;
 using Microsoft.AspNetCore.OData.Query;
 using Microsoft.AspNetCore.OData.Routing.Controllers;
 using Microsoft.EntityFrameworkCore;

diff --git a/GridBlazorOData.Server/Controllers/OrdersController.cs b/GridBlazorOData.Server/Controllers/OrdersController.cs
@@ -1,10 +1,9 @@
 using GridBlazorOData.Server.Models;
 using GridBlazorOData.Shared.Models;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Deltas;
 using Microsoft.AspNetCore.OData.Formatter;
-using Microsoft.AspNetCore.OData.Formatter.Value;
 using Microsoft.AspNetCore.OData.Query;
-using Microsoft.AspNetCore.OData.Routing.Attributes;
 using Microsoft.AspNetCore.OData.Routing.Controllers;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -151,8 +150,7 @@ private bool OrderExists(int key)
         }
 
         [EnableQuery]
-        [HttpGet]
-        [ODataRoute("Orders({keyOrderID})/OrderDetails")]
+        [HttpGet("Orders({keyOrderID})/OrderDetails")]
         public IActionResult GetOrderDetails(int keyOrderID)
         {
             var repository = new OrderDetailsRepository(_context);
@@ -161,17 +159,15 @@ public IActionResult GetOrderDetails(int keyOrderID)
         }
 
         [EnableQuery]
-        [HttpGet]
-        [ODataRoute("Orders({orderID})/OrderDetails({keyOrderID},{keyProductID})")]
+        [HttpGet("Orders({orderID})/OrderDetails({keyOrderID},{keyProductID})")]
         public async Task<IActionResult> GetOrderDetails([FromODataUri] int keyOrderID, [FromODataUri] int keyProductID)
         {
             var repository = new OrderDetailsRepository(_context);
             OrderDetail orderDetail = await repository.GetById(new { OrderID = keyOrderID, ProductID = keyProductID });
             return Ok(orderDetail);
         }
 
-        [HttpPost]
-        [ODataRoute("Orders({keyOrderID})/OrderDetails")]
+        [HttpPost("Orders({keyOrderID})/OrderDetails")]
         public async Task<IActionResult> PostToOrderDetails([FromODataUri] int keyOrderID, [FromBody] OrderDetail orderdetail)
         {
             if (!ModelState.IsValid)
@@ -201,8 +197,7 @@ public async Task<IActionResult> PostToOrderDetails([FromODataUri] int keyOrderI
             }
         }
 
-        [HttpPatch]
-        [ODataRoute("Orders({orderID})/OrderDetails({keyOrderID},{keyProductID})")]
+        [HttpPatch("Orders({orderID})/OrderDetails({keyOrderID},{keyProductID})")]
         public async Task<IActionResult> PatchToOrderDetails([FromODataUri] int keyOrderID, [FromODataUri] int keyProductID,
             [FromBody] Delta<OrderDetail> orderDetail)
         {
@@ -236,8 +231,7 @@ public async Task<IActionResult> PatchToOrderDetails([FromODataUri] int keyOrder
             return Updated(entity);
         }
 
-        [HttpPut]
-        [ODataRoute("Orders({orderID})/OrderDetails({keyOrderID},{keyProductID})")]
+        [HttpPut("Orders({orderID})/OrderDetails({keyOrderID},{keyProductID})")]
         public async Task<IActionResult> PutToOrderDetails([FromODataUri] int keyOrderID, [FromODataUri] int keyProductID,
             [FromBody] OrderDetail orderDetail)
         {
@@ -270,8 +264,7 @@ public async Task<IActionResult> PutToOrderDetails([FromODataUri] int keyOrderID
             return Updated(orderDetail);
         }
 
-        [HttpDelete]
-        [ODataRoute("Orders({orderID})/OrderDetails({keyOrderID},{keyProductID})")]
+        [HttpDelete("Orders({orderID})/OrderDetails({keyOrderID},{keyProductID})")]
         public async Task<ActionResult> DeleteToOrderDetails([FromODataUri] int keyOrderID, [FromODataUri] int keyProductID)
         {
             var repository = new OrderDetailsRepository(_context);

diff --git a/GridBlazorOData.Server/GridBlazorOData.Server.csproj b/GridBlazorOData.Server/GridBlazorOData.Server.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>
-    <Version>2.1.6</Version>
+    <Version>2.1.18</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.0-preview3" />
+    <PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Text.Json" Version="5.0.1" />
   </ItemGroup>

diff --git a/GridBlazorOData.Server/Startup.cs b/GridBlazorOData.Server/Startup.cs
@@ -41,8 +41,7 @@ public void ConfigureServices(IServiceCollection services)
                     });
             });
 
-            services.AddControllers();
-            services.AddOData(opt => opt.AddModel("odata", EdmModel.GetEdmModel())
+            services.AddControllers().AddOData(opt => opt.AddRouteComponents("odata", EdmModel.GetEdmModel())
                 .Select().Expand().Filter().OrderBy().SetMaxTop(null).Count());
         }