Dev (#11)

* - add option to change endpoint service lifetime during service registration
- add overload to add endpoints from assemblies containing a given type
- rename core endpoint registration methods for clarity

* - update deps to latest

* - bump version

Author: modabas

Directory.Build.props

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

samples/ShowcaseWebApi/Extensions/WebApplicationBuilderExtensions.cs

@@ -87,7 +87,7 @@ public static WebApplicationBuilder AddWebServices(this WebApplicationBuilder bu
 
   public static WebApplicationBuilder AddFeatures(this WebApplicationBuilder builder)
   {
-    builder.Services.AddModEndpointsFromAssembly(typeof(WebApplicationBuilderExtensions).Assembly);
+    builder.Services.AddModEndpointsFromAssemblyContaining<GetBookById>();
     builder.Services.AddValidatorsFromAssemblyContaining<GetBookByIdRequestValidator>(includeInternalTypes: true);
 
     return builder;

samples/ShowcaseWebApi/ShowcaseWebApi.csproj

@@ -10,7 +10,7 @@
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
     <PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
     <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
-    <PackageReference Include="UUIDNext" Version="4.1.0" />
+    <PackageReference Include="UUIDNext" Version="4.1.1" />
   </ItemGroup>
 
   <ItemGroup>

src/ModEndpoints.Core/DependencyInjectionExtensions.cs

@@ -9,18 +9,28 @@
 namespace ModEndpoints.Core;
 public static class DependencyInjectionExtensions
 {
-  public static IServiceCollection AddModEndpointsFromAssemblyCore(
+  public static IServiceCollection AddModEndpointsCoreFromAssemblyContaining<T>(
     this IServiceCollection services,
-    Assembly assembly)
+    Assembly assembly,
+    ServiceLifetime lifetime = ServiceLifetime.Transient)
+  {
+    return services.AddModEndpointsCoreFromAssembly(typeof(T).Assembly, lifetime);
+  }
+
+  public static IServiceCollection AddModEndpointsCoreFromAssembly(
+    this IServiceCollection services,
+    Assembly assembly,
+    ServiceLifetime lifetime = ServiceLifetime.Transient)
   {
     return services
-      .AddRouteGroupsFromAssemblyCore(assembly)
-      .AddEndpointsFromAssemblyCore(assembly);
+      .AddRouteGroupsCoreFromAssembly(assembly, lifetime)
+      .AddEndpointsCoreFromAssembly(assembly, lifetime);
   }
 
-  private static IServiceCollection AddRouteGroupsFromAssemblyCore(
+  private static IServiceCollection AddRouteGroupsCoreFromAssembly(
     this IServiceCollection services,
-    Assembly assembly)
+    Assembly assembly,
+    ServiceLifetime lifetime)
   {
     //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
@@ -29,17 +39,18 @@ private static IServiceCollection AddRouteGroupsFromAssemblyCore(
         .Where(type => type is { IsAbstract: false, IsInterface: false } &&
                        type.IsAssignableTo(typeof(IRouteGroupConfigurator)) &&
                        type != typeof(RootRouteGroup))
-        .Select(type => ServiceDescriptor.KeyedTransient(typeof(IRouteGroupConfigurator), type, type))
+        .Select(type => ServiceDescriptor.DescribeKeyed(typeof(IRouteGroupConfigurator), type, type, lifetime))
         .ToArray();
 
     services.TryAddEnumerable(serviceDescriptors);
 
     return services;
   }
 
-  public static IServiceCollection AddEndpointsFromAssemblyCore(
+  public static IServiceCollection AddEndpointsCoreFromAssembly(
     this IServiceCollection services,
-    Assembly assembly)
+    Assembly assembly,
+    ServiceLifetime lifetime)
   {
     var endpointTypes = assembly
       .DefinedTypes
@@ -49,7 +60,7 @@ public static IServiceCollection AddEndpointsFromAssemblyCore(
     CheckServiceEndpointRegistrations(endpointTypes);
 
     var serviceDescriptors = endpointTypes
-        .Select(type => ServiceDescriptor.KeyedTransient(typeof(IEndpointConfigurator), type, type))
+        .Select(type => ServiceDescriptor.DescribeKeyed(typeof(IEndpointConfigurator), type, type, lifetime))
         .ToArray();
 
     services.TryAddEnumerable(serviceDescriptors);

src/ModEndpoints.RemoteServices/ModEndpoints.RemoteServices.csproj

@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.2" />
-    <PackageReference Include="ModResults" Version="0.4.2" />
+    <PackageReference Include="ModResults" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/ModEndpoints/DependencyInjectionExtensions.cs

@@ -8,9 +8,17 @@
 namespace ModEndpoints;
 public static class DependencyInjectionExtensions
 {
+  public static IServiceCollection AddModEndpointsFromAssemblyContaining<T>(
+    this IServiceCollection services,
+    ServiceLifetime lifetime = ServiceLifetime.Transient)
+  {
+    return services.AddModEndpointsFromAssembly(typeof(T).Assembly, lifetime);
+  }
+
   public static IServiceCollection AddModEndpointsFromAssembly(
     this IServiceCollection services,
-    Assembly assembly)
+    Assembly assembly,
+    ServiceLifetime lifetime = ServiceLifetime.Transient)
   {
     //WebResultEndpoint components
     services.TryAddKeyedSingleton<IResultToResponseMapper, DefaultResultToResponseMapper>(
@@ -24,7 +32,7 @@ public static IServiceCollection AddModEndpointsFromAssembly(
     services.TryAddSingleton<IUriResolverProvider, DefaultUriResolverProvider>();
 
     services.AddHttpContextAccessor();
-    return services.AddModEndpointsFromAssemblyCore(assembly);
+    return services.AddModEndpointsCoreFromAssembly(assembly, lifetime);
   }
 
   public static WebApplication MapModEndpoints(

src/ModEndpoints/ModEndpoints.csproj

@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ModResults.FluentValidation" Version="0.4.2" />
-    <PackageReference Include="ModResults.MinimalApis" Version="0.4.2" />
+    <PackageReference Include="ModResults.FluentValidation" Version="1.0.0" />
+    <PackageReference Include="ModResults.MinimalApis" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>