Update to ServiceComposer and use contractless composition handlers

mauroservienti · mauroservienti · commit fce1286a9e01 · 2025-02-08T17:35:55.000+01:00
diff --git a/ASP.Net Core API Gateway - 01/Catalog.ViewModelComposition/Catalog.ViewModelComposition.csproj b/ASP.Net Core API Gateway - 01/Catalog.ViewModelComposition/Catalog.ViewModelComposition.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.1.2" />
+    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.2.0-beta.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ASP.Net Core API Gateway - 01/Composition.Tests/When_calling_composition_gateway.cs b/ASP.Net Core API Gateway - 01/Composition.Tests/When_calling_composition_gateway.cs
@@ -55,7 +55,7 @@ HttpClient ClientProvider(string name) =>
                         name switch
                         {
                             var val when val == typeof(Shipping.ViewModelComposition.ProductDetailsGetHandler).FullName => _shippingApiClient,
-                            var val when val == typeof(Warehouse.ViewModelComposition.ProductDetailsGetHandler).FullName => _warehouseApiClient,
+                            var val when val == typeof(Warehouse.ViewModelComposition.CompositionHandlers.ProductDetailsCompositionHandler).FullName => _warehouseApiClient,
                             var val when val == typeof(Sales.ViewModelComposition.ProductDetailsGetHandler).FullName => _salesApiClient,
                             var val when val == typeof(Catalog.ViewModelComposition.ProductDetailsGetHandler).FullName => _catalogApiClient,
                             _ => throw new NotSupportedException($"Missing HTTP client for {name}")
diff --git a/ASP.Net Core API Gateway - 01/CompositionGateway/CompositionGateway.csproj b/ASP.Net Core API Gateway - 01/CompositionGateway/CompositionGateway.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.1.2" />
+    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.2.0-beta.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Catalog.ViewModelComposition\Catalog.ViewModelComposition.csproj" />
diff --git a/ASP.Net Core API Gateway - 01/CompositionGateway/Startup.cs b/ASP.Net Core API Gateway - 01/CompositionGateway/Startup.cs
@@ -9,9 +9,11 @@ public class Startup
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddHttpContextAccessor();
             services.AddHttpClient();
             services.AddRouting();
             services.AddViewModelComposition();
+            services.AddControllers();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
diff --git a/ASP.Net Core API Gateway - 01/ConfigurationUtils/ConfigurationUtils.csproj b/ASP.Net Core API Gateway - 01/ConfigurationUtils/ConfigurationUtils.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="ServiceComposer.AspNetCore" Version="4.1.2" />
+      <PackageReference Include="ServiceComposer.AspNetCore" Version="4.2.0-beta.2" />
     </ItemGroup>
 
 </Project>
diff --git a/ASP.Net Core API Gateway - 01/Sales.ViewModelComposition/Sales.ViewModelComposition.csproj b/ASP.Net Core API Gateway - 01/Sales.ViewModelComposition/Sales.ViewModelComposition.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.1.2" />
+    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.2.0-beta.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ASP.Net Core API Gateway - 01/Shipping.ViewModelComposition/Shipping.ViewModelComposition.csproj b/ASP.Net Core API Gateway - 01/Shipping.ViewModelComposition/Shipping.ViewModelComposition.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.1.2" />
+    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.2.0-beta.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ASP.Net Core API Gateway - 01/Warehouse.ViewModelComposition/CompositionHandlers/ProductDetailsCompositionHandler.cs b/ASP.Net Core API Gateway - 01/Warehouse.ViewModelComposition/CompositionHandlers/ProductDetailsCompositionHandler.cs
@@ -0,0 +1,24 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using JsonUtils;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using ServiceComposer.AspNetCore;
+
+namespace Warehouse.ViewModelComposition.CompositionHandlers;
+
+public class ProductDetailsCompositionHandler(HttpClient client, IHttpContextAccessor httpContextAccessor)
+{
+    [HttpGet("/products/details/{id}")]
+    public async Task Get(string id)
+    {
+        var url = $"/api/inventory/product/{id}";
+        var response = await client.GetAsync(url);
+
+        dynamic stockItem = await response.Content.AsExpando();
+
+        dynamic vm = httpContextAccessor.HttpContext.Request.GetComposedResponseModel();
+        vm.ProductInventory = stockItem.Inventory;
+        vm.ProductOutOfStock = stockItem.Inventory == 0;
+    }
+}
diff --git a/ASP.Net Core API Gateway - 01/Warehouse.ViewModelComposition/ProductDetailsGetHandler.cs b/ASP.Net Core API Gateway - 01/Warehouse.ViewModelComposition/ProductDetailsGetHandler.cs
diff --git a/ASP.Net Core API Gateway - 01/Warehouse.ViewModelComposition/ViewModelCompositionOptionsCustomization.cs b/ASP.Net Core API Gateway - 01/Warehouse.ViewModelComposition/ViewModelCompositionOptionsCustomization.cs
@@ -1,15 +1,14 @@
-﻿using System;
-using ConfigurationUtils;
-using Microsoft.Extensions.DependencyInjection;
+﻿using ConfigurationUtils;
 using ServiceComposer.AspNetCore;
+using Warehouse.ViewModelComposition.CompositionHandlers;
 
 namespace Warehouse.ViewModelComposition
 {
     public class ViewModelCompositionOptionsCustomization : IViewModelCompositionOptionsCustomization
     {
         public void Customize(ViewModelCompositionOptions options)
         {
-            options.RegisterHttpClient<ProductDetailsGetHandler>("http://localhost:5003");
+            options.RegisterHttpClient<ProductDetailsCompositionHandler>("http://localhost:5003");
         }
     }
 }
diff --git a/ASP.Net Core API Gateway - 01/Warehouse.ViewModelComposition/Warehouse.ViewModelComposition.csproj b/ASP.Net Core API Gateway - 01/Warehouse.ViewModelComposition/Warehouse.ViewModelComposition.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.1.2" />
+    <PackageReference Include="ServiceComposer.AspNetCore" Version="4.2.0-beta.2" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ HttpClient ClientProvider(string name) =>`
`55`	`55`	`name switch`
`56`	`56`	`{`
`57`	`57`	`var val when val == typeof(Shipping.ViewModelComposition.ProductDetailsGetHandler).FullName => _shippingApiClient,`
`58`		`- var val when val == typeof(Warehouse.ViewModelComposition.ProductDetailsGetHandler).FullName => _warehouseApiClient,`
	`58`	`+ var val when val == typeof(Warehouse.ViewModelComposition.CompositionHandlers.ProductDetailsCompositionHandler).FullName => _warehouseApiClient,`
`59`	`59`	`var val when val == typeof(Sales.ViewModelComposition.ProductDetailsGetHandler).FullName => _salesApiClient,`
`60`	`60`	`var val when val == typeof(Catalog.ViewModelComposition.ProductDetailsGetHandler).FullName => _catalogApiClient,`
`61`	`61`	`_ => throw new NotSupportedException($"Missing HTTP client for {name}")`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,11 @@ public class Startup`
`9`	`9`	`{`
`10`	`10`	`public void ConfigureServices(IServiceCollection services)`
`11`	`11`	`{`
	`12`	`+ services.AddHttpContextAccessor();`
`12`	`13`	`services.AddHttpClient();`
`13`	`14`	`services.AddRouting();`
`14`	`15`	`services.AddViewModelComposition();`
	`16`	`+ services.AddControllers();`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`		`-using System;`
`2`		`-using ConfigurationUtils;`
`3`		`-using Microsoft.Extensions.DependencyInjection;`
	`1`	`+using ConfigurationUtils;`
`4`	`2`	`using ServiceComposer.AspNetCore;`
	`3`	`+using Warehouse.ViewModelComposition.CompositionHandlers;`
`5`	`4`
`6`	`5`	`namespace Warehouse.ViewModelComposition`
`7`	`6`	`{`
`8`	`7`	`public class ViewModelCompositionOptionsCustomization : IViewModelCompositionOptionsCustomization`
`9`	`8`	`{`
`10`	`9`	`public void Customize(ViewModelCompositionOptions options)`
`11`	`10`	`{`
`12`		`- options.RegisterHttpClient<ProductDetailsGetHandler>("http://localhost:5003");`
	`11`	`+ options.RegisterHttpClient<ProductDetailsCompositionHandler>("http://localhost:5003");`
`13`	`12`	`}`
`14`	`13`	`}`
`15`	`14`	`}`