Support for non-nullable strings in Swagger (#27)

Homely · May 11, 2020 · 189d549 · 189d549
1 parent ae7b7ce
commit 189d549
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/Homely.AspNetCore.Mvc.Helpers/Homely.AspNetCore.Mvc.Helpers.csproj b/src/Homely.AspNetCore.Mvc.Helpers/Homely.AspNetCore.Mvc.Helpers.csproj
@@ -27,7 +27,7 @@
         <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="5.1.0" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/TestWebApplication/Controllers/TestController.cs b/tests/TestWebApplication/Controllers/TestController.cs
@@ -28,12 +28,12 @@ public TestController(IFakeVehicleRepository fakeVehicleRepository)
 
         // GET: /test/1 | 200 OK.
         [HttpGet("{id:int}", Name = "GetId")]
-        public IActionResult Get(int id)
+        public ActionResult<FakeVehicle> Get(int id)
         {
             var model = _fakeVehicleRepository.Get(id);
 
             return model == null
-                ? (IActionResult)NotFound()
+                ? (ActionResult<FakeVehicle>) NotFound()
                 : Ok(model);
         }
 

diff --git a/tests/TestWebApplication/Models/FakeVehicle.cs b/tests/TestWebApplication/Models/FakeVehicle.cs
@@ -1,8 +1,13 @@
-namespace TestWebApplication.Models
+using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
+
+namespace TestWebApplication.Models
 {
     public class FakeVehicle
     {
         public int Id { get; set; }
+
+        [Required]
         public string Name { get; set; }
         public string RegistrationNumber { get; set; }
         public ColourType Colour { get; set; }