Simplified examples

Author: PawelGerr

docs

@@ -22,24 +22,12 @@ public IActionResult RoundTrip(ProductCategory category)
       return RoundTripValidatableEnum(category);
    }
 
-   [HttpGet("categoryWithConverter/{category}")]
-   public IActionResult RoundTrip(ProductCategoryWithJsonConverter category)
-   {
-      return RoundTripValidatableEnum(category);
-   }
-
    [HttpGet("group/{group}")]
    public IActionResult RoundTrip(ProductGroup group)
    {
       return RoundTripValidatableEnum(group);
    }
 
-   [HttpGet("groupWithConverter/{group}")]
-   public IActionResult RoundTrip(ProductGroupWithJsonConverter group)
-   {
-      return RoundTripValidatableEnum(group);
-   }
-
    [HttpGet("productType/{productType}")]
    public IActionResult RoundTrip(ProductType productType)
    {
@@ -75,12 +63,6 @@ public IActionResult RoundTripPost([FromBody] ProductTypeWrapper productType)
       return RoundTripInternal(productType.ProductType);
    }
 
-   [HttpGet("productTypeWithJsonConverter/{productType}")]
-   public IActionResult RoundTrip(ProductTypeWithJsonConverter productType)
-   {
-      return RoundTripInternal(productType);
-   }
-
    [HttpGet("productName/{name}")]
    public IActionResult RoundTrip(ProductName? name)
    {
@@ -125,17 +107,6 @@ public IActionResult RoundTripPost([FromBody] OtherProductName? name)
       return Json(name);
    }
 
-   [HttpPost("boundary")]
-   public IActionResult RoundTrip([FromBody] BoundaryWithJsonConverter boundary)
-   {
-      if (!ModelState.IsValid)
-         return BadRequest(ModelState);
-
-      _logger.LogInformation("Round trip test with {Type}: {Boundary}", boundary.GetType().Name, boundary);
-
-      return Json(boundary);
-   }
-
    [HttpGet("enddate/{endDate}")]
    public IActionResult RoundTripGet(OpenEndDate endDate)
    {

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/BoundaryWithJsonConverter.cs

@@ -45,12 +45,9 @@ private static async Task DoHttpRequestsAsync(ILogger logger, bool forMinimalWeb
       using var client = new HttpClient();
 
       await DoRequestAsync(logger, client, "category/fruits");
-      await DoRequestAsync(logger, client, "categoryWithConverter/fruits");
       await DoRequestAsync(logger, client, "group/1");
       await DoRequestAsync(logger, client, "group/42");      // invalid
       await DoRequestAsync(logger, client, "group/invalid"); // invalid
-      await DoRequestAsync(logger, client, "groupWithConverter/1");
-      await DoRequestAsync(logger, client, "groupWithConverter/42"); // invalid
       await DoRequestAsync(logger, client, "productType/groceries");
       await DoRequestAsync(logger, client, "productType?productType=groceries");
       await DoRequestAsync(logger, client, "productType", "groceries");
@@ -63,8 +60,6 @@ private static async Task DoHttpRequestsAsync(ILogger logger, bool forMinimalWeb
 
       await DoRequestAsync(logger, client, "productType", "invalid");                              // invalid
       await DoRequestAsync(logger, client, "productTypeWrapper", new { ProductType = "invalid" }); // invalid
-      await DoRequestAsync(logger, client, "productTypeWithJsonConverter/groceries");
-      await DoRequestAsync(logger, client, "productTypeWithJsonConverter/invalid"); // invalid
 
       await DoRequestAsync(logger, client, "productName/bread");
       await DoRequestAsync(logger, client, "productName/a");   // invalid (Product name cannot be 1 character long.)
@@ -79,7 +74,7 @@ private static async Task DoHttpRequestsAsync(ILogger logger, bool forMinimalWeb
       await DoRequestAsync(logger, client, "otherProductName", "bread");
       await DoRequestAsync(logger, client, "otherProductName", "a"); // invalid (Product name cannot be 1 character long.)
 
-      await DoRequestAsync(logger, client, "boundary", BoundaryWithJsonConverter.Create(1, 2));
+      await DoRequestAsync(logger, client, "boundary", Boundary.Create(1, 2));
       await DoRequestAsync(logger, client, "boundary", jsonBody: "{ \"lower\": 2, \"upper\": 1 }");
 
       await DoRequestAsync(logger, client, $"enddate/{DateOnly.FromDateTime(DateTime.Now):O}");
@@ -150,9 +145,7 @@ private static Task StartMinimalWebApiAsync(ILoggerFactory loggerFactory)
       var routeGroup = app.MapGroup("/api");
 
       routeGroup.MapGet("category/{category}", (ProductCategory category) => new { Value = category, category.IsValid });
-      routeGroup.MapGet("categoryWithConverter/{category}", (ProductCategoryWithJsonConverter category) => new { Value = category, category.IsValid });
       routeGroup.MapGet("group/{group}", (ProductGroup group) => new { Value = group, group.IsValid });
-      routeGroup.MapGet("groupWithConverter/{group}", (ProductGroupWithJsonConverter group) => new { Value = group, group.IsValid });
       routeGroup.MapGet("productType/{productType}", (ProductType productType) => productType);
       routeGroup.MapGet("productType", (ProductType productType) => productType);
       routeGroup.MapGet("productTypeWithFilter", (BoundValueObject<ProductType, ProductTypeValidationError> productType) => ValueTask.FromResult(productType.Value))
@@ -168,12 +161,11 @@ private static Task StartMinimalWebApiAsync(ILoggerFactory loggerFactory)
       routeGroup.MapGet("boundaryWithFactories/{boundary}", (BoundaryWithFactories boundary) => boundary);
       routeGroup.MapPost("productType", ([FromBody] ProductType productType) => productType);
       routeGroup.MapPost("productTypeWrapper", ([FromBody] ProductTypeWrapper productType) => productType);
-      routeGroup.MapGet("productTypeWithJsonConverter/{productType}", (ProductTypeWithJsonConverter productType) => productType);
       routeGroup.MapGet("productName/{name}", (ProductName name) => name);
       routeGroup.MapPost("productName", ([FromBody] ProductName name) => name);
       routeGroup.MapGet("otherProductName/{name}", (OtherProductName? name) => name);
       routeGroup.MapPost("otherProductName", ([FromBody] OtherProductName name) => name);
-      routeGroup.MapPost("boundary", ([FromBody] BoundaryWithJsonConverter boundary) => boundary);
+      routeGroup.MapPost("boundary", ([FromBody] Boundary boundary) => boundary);
 
       routeGroup.MapGet("enddate/{date}", (OpenEndDate date) => date);
       routeGroup.MapPost("enddate", ([FromBody] OpenEndDate date) => date);

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/Controllers/DemoController.cs

@@ -20,12 +20,6 @@ public int Do(string foo)
       return 42;
    }
 
-   // ReSharper disable UnusedParameterInPartialMethod
-   static partial void ValidateConstructorArguments(ref int key, bool isValid, ref string displayName, ref ProductCategory category)
-   {
-   }
-   // ReSharper restore UnusedParameterInPartialMethod
-
    private static ProductGroup CreateInvalidItem(int key)
    {
       // the values can be anything besides the key,

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/ProductCategoryWithJsonConverter.cs

@@ -7,6 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions\Thinktecture.Runtime.Extensions.csproj" />
+    <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.Json\Thinktecture.Runtime.Extensions.Json.csproj" />
     <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.SourceGenerator\Thinktecture.Runtime.Extensions.SourceGenerator.csproj" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
   </ItemGroup>
   <ItemGroup>

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/ProductGroupWithJsonConverter.cs

@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Serilog;
@@ -223,5 +222,14 @@ private static void DemoForJurisdiction(ILogger logger)
       );
 
       logger.Information(description);
+
+      // Json serialization
+      var json = JsonSerializer.Serialize<Jurisdiction>(district);
+      logger.Information(json); //  {"$type":"District","value":"District 42"}
+
+      var deserializedJurisdiction = JsonSerializer.Deserialize<Jurisdiction>(json);
+      logger.Information("Deserialized jurisdiction: {Jurisdiction} ({Type})",
+                         deserializedJurisdiction,
+                         deserializedJurisdiction?.GetType().Name);
    }
 }