Dev (#34)

* - prune unused preperties
- update docs

* - configuration of endpoints and route groups no longer resolves components from service provider, instead uses RuntimeHelpers.GetUninitializedObject and DOES NOT resolve any of the componenets in ctor dependency injection.
- remove unnecessary dependency

* - add info to docs on dependencies resolved from constructor not being available during configuration.

* - bump version

Author: modabas

Directory.Build.props

@@ -18,6 +18,6 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
 
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
   </PropertyGroup>
 </Project>

README.md

@@ -57,7 +57,9 @@ Each endpoint must implement two virtual methods:
 
 2. **HandleAsync**: Contains the logic to handle incoming requests. Called after the request is validated (if applicable).
 
-> **Note**: `ServiceEndpoint` provides a default implementation for the `Configure` method, which can be overridden if necessary.
+> **Note**: Dependencies resolved from constructor are not available during configuration. To access a service from dependency injection in the configuration phase, use the `ServiceProvider` property of the configuration context parameter in the `Configure` method.
+
+> **Note**: `ServiceEndpoint` provides a default implementation for the `Configure` method, and only requires `HandleAsync` method implementation.
 
 ---
 

docs/EndpointTypes_MinimalEndpoint.md

@@ -2,7 +2,7 @@
 
 >**Package**: `ModEndpoints.Core`
 
-MinimalEndpoint within `ModEndpoints.Core` package is closest to barebones Minimal API. Request model (if any) defined for a MinimalEndpoint is bound with [AsParameters] attribute. Its 'HandleAsync' method supports the following types of return values:
+MinimalEndpoint is the endpoint type that is most close to a Minimal API. Request model (if any) defined for a MinimalEndpoint is bound with [AsParameters] attribute. Its 'HandleAsync' method supports the following types of return values:
 
 - string
 - T (Any other type)

docs/RouteGroups.md

@@ -8,6 +8,8 @@ By default, all endpoints are mapped under root route group. It is possible to d
 
 Following sample creates a parent route group (FeaturesRouteGroup), a child route group under it (BooksV1RouteGroup) and maps an endpoint (CreateBook) to child route group. Group configuration methods used for this particular sample are all part of Minimal APIs ecosystem and are under [Asp.Versioning](https://github.com/dotnet/aspnet-api-versioning).
 
+> **Note**: Dependencies resolved from constructor are not available during configuration. To access a service from dependency injection in the configuration phase, use the `ServiceProvider` property of the configuration context parameter in the `Configure` method.
+
 ```csharp
 internal class FeaturesRouteGroup : RouteGroupConfigurator
 {

src/ModEndpoints.Core/DependencyInjectionExtensions.cs

@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
@@ -63,12 +64,14 @@ private static IServiceCollection AddRouteGroupsCoreFromAssembly(
   {
     //Don't add RootRouteGroup, it's just a marker class to define root
     //Normally its assembly won't be loaded with this method anyway but just in case
-    var serviceDescriptors = assembly
+    var routeGroupTypes = assembly
       .DefinedTypes
       .Where(type => type is { IsAbstract: false, IsInterface: false } &&
         type.IsAssignableTo(typeof(IRouteGroupConfigurator)) &&
         type != typeof(RootRouteGroup) &&
-        !type.GetCustomAttributes<DoNotRegisterAttribute>().Any())
+        !type.GetCustomAttributes<DoNotRegisterAttribute>().Any());
+
+    var serviceDescriptors = routeGroupTypes
       .Select(type => ServiceDescriptor.DescribeKeyed(
         typeof(IRouteGroupConfigurator),
         type,
@@ -77,6 +80,7 @@ private static IServiceCollection AddRouteGroupsCoreFromAssembly(
       .ToArray();
 
     services.TryAddEnumerable(serviceDescriptors);
+    ComponentRegistry.Instance.TryAddRouteGroups(routeGroupTypes);
 
     return services;
   }
@@ -162,6 +166,7 @@ static void AddServiceEndpoint(
       {
         services.TryAdd(descriptor);
       }
+      ComponentRegistry.Instance.TryAddEndpoint(requestType, endpointType);
     }
 
     static void AddEndpoint(
@@ -174,6 +179,7 @@ static void AddEndpoint(
         endpointType,
         endpointType,
         options.EndpointLifetime));
+      ComponentRegistry.Instance.TryAddEndpoint(endpointType, endpointType);
     }
 
     static Type[] GetGenericArgumentsOfBase(Type derivedType, Type baseType)
@@ -232,8 +238,8 @@ public static WebApplication MapModEndpointsCore(
     IEndpointRouteBuilder builder = app;
     using (var scope = builder.ServiceProvider.CreateScope())
     {
-      var routeGroups = scope.ServiceProvider.GetKeyedServices<IRouteGroupConfigurator>(KeyedService.AnyKey);
-      var endpoints = scope.ServiceProvider.GetKeyedServices<IEndpointConfigurator>(KeyedService.AnyKey);
+      var routeGroups = ComponentRegistry.Instance.GetRouteGroups().Select(t => RuntimeHelpers.GetUninitializedObject(t) as IRouteGroupConfigurator).Where(i => i is not null).Select(i => i!); ;
+      var endpoints = ComponentRegistry.Instance.GetEndpoints().Select(t => RuntimeHelpers.GetUninitializedObject(t) as IEndpointConfigurator).Where(i => i is not null).Select(i => i!);
 
       //Items that don't have a membership to any route group or
       //items that have a membership to root route group (items at root)

src/ModEndpoints.Core/ModEndpoints.Core.csproj

@@ -22,7 +22,6 @@
 
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="12.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
   </ItemGroup>
 
   <ItemGroup>

src/ModEndpoints.Core/[Configuration]/ComponentRegistry.cs

@@ -0,0 +1,45 @@
+using System.Collections.Concurrent;
+
+namespace ModEndpoints.Core;
+
+internal class ComponentRegistry
+{
+  private readonly ConcurrentDictionary<Type, Type> _routeGroups;
+  private readonly ConcurrentDictionary<Type, Type> _endpoints;
+
+  private static Lazy<ComponentRegistry> _instance =
+    new Lazy<ComponentRegistry>(
+      () => new ComponentRegistry(),
+      LazyThreadSafetyMode.ExecutionAndPublication);
+
+  public static ComponentRegistry Instance => _instance.Value;
+
+  private ComponentRegistry()
+  {
+    _routeGroups = new();
+    _endpoints = new();
+  }
+
+  public void TryAddRouteGroups(IEnumerable<Type> implementationTypes)
+  {
+    foreach (var type in implementationTypes)
+    {
+      _routeGroups[type] = type;
+    }
+  }
+
+  public void TryAddEndpoint(Type key, Type implementationType)
+  {
+    _endpoints[key] = implementationType;
+  }
+
+  public ICollection<Type> GetRouteGroups()
+  {
+    return _routeGroups.Values;
+  }
+
+  public ICollection<Type> GetEndpoints()
+  {
+    return _endpoints.Values;
+  }
+}

src/ModEndpoints.Core/[Configuration]/RouteGroupConfigurator.cs

@@ -7,10 +7,6 @@ public abstract class RouteGroupConfigurator : IRouteGroupConfigurator
 {
   private RouteGroupConfigurationBuilder? _configurationBuilder;
 
-  public virtual Action<RouteHandlerBuilder, ConfigurationContext<EndpointConfigurationParameters>>? EndpointConfigurationOverrides => null;
-
-  public virtual Action<RouteGroupBuilder, ConfigurationContext<RouteGroupConfigurationParameters>>? ConfigurationOverrides => null;
-
   /// <summary>
   /// Entry point for route group configuration. Called by DI.
   /// </summary>