Skip to content

Nuke DependencyInjection.NamedServices #4225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2023
Merged

Nuke DependencyInjection.NamedServices #4225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions ...loud.Messaging/DependencyInjection/Extensions/AsyncProcessingPipelineBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ public static class AsyncProcessingPipelineBuilderExtensions
/// <param name="pipelineBuilder">The builder for async processing pipeline.</param>
/// <returns><see cref="IAsyncProcessingPipelineBuilder"/> to chain additional calls.</returns>
/// <exception cref="ArgumentNullException">Any argument is <see langword="null"/>.</exception>
public static IAsyncProcessingPipelineBuilder AddNamedSingleton<T>(this IAsyncProcessingPipelineBuilder pipelineBuilder)
public static IAsyncProcessingPipelineBuilder AddKeyedSingleton<T>(this IAsyncProcessingPipelineBuilder pipelineBuilder)
where T : class
{
_ = Throw.IfNull(pipelineBuilder);

_ = pipelineBuilder.Services.AddNamedSingleton(pipelineBuilder.PipelineName, sp => sp.GetRequiredService<T>());
_ = pipelineBuilder.Services.AddKeyedSingleton(pipelineBuilder.PipelineName, (sp, _) => sp.GetRequiredService<T>());
return pipelineBuilder;
}

Expand All @@ -46,14 +46,14 @@ public static IAsyncProcessingPipelineBuilder AddNamedSingleton<T>(this IAsyncPr
/// <param name="implementationFactory">The implementation factory for the singleton type.</param>
/// <returns><see cref="IAsyncProcessingPipelineBuilder"/> to chain additional calls.</returns>
/// <exception cref="ArgumentNullException">Any argument is <see langword="null"/>.</exception>
public static IAsyncProcessingPipelineBuilder AddNamedSingleton<T>(this IAsyncProcessingPipelineBuilder pipelineBuilder,
public static IAsyncProcessingPipelineBuilder AddKeyedSingleton<T>(this IAsyncProcessingPipelineBuilder pipelineBuilder,
Func<IServiceProvider, T> implementationFactory)
where T : class
{
_ = Throw.IfNull(pipelineBuilder);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton(pipelineBuilder.PipelineName, implementationFactory);
_ = pipelineBuilder.Services.AddKeyedSingleton(pipelineBuilder.PipelineName, implementationFactory);
return pipelineBuilder;
}

Expand All @@ -66,7 +66,7 @@ public static IAsyncProcessingPipelineBuilder AddNamedSingleton<T>(this IAsyncPr
/// <param name="implementationFactory">The implementation factory for the singleton type.</param>
/// <returns><see cref="IAsyncProcessingPipelineBuilder"/> to chain additional calls.</returns>
/// <exception cref="ArgumentNullException">Any argument is <see langword="null"/>.</exception>
public static IAsyncProcessingPipelineBuilder AddNamedSingleton<T>(this IAsyncProcessingPipelineBuilder pipelineBuilder,
public static IAsyncProcessingPipelineBuilder AddKeyedSingleton<T>(this IAsyncProcessingPipelineBuilder pipelineBuilder,
string name,
Func<IServiceProvider, T> implementationFactory)
where T : class
Expand All @@ -75,7 +75,7 @@ public static IAsyncProcessingPipelineBuilder AddNamedSingleton<T>(this IAsyncPr
_ = Throw.IfNullOrEmpty(name);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton(name, implementationFactory);
_ = pipelineBuilder.Services.AddKeyedSingleton(name, (sp, _) => implementationFactory(sp));
return pipelineBuilder;
}

Expand All @@ -94,7 +94,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureMessageDestination<TDesti
{
_ = Throw.IfNull(pipelineBuilder);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageDestination>(pipelineBuilder.PipelineName, sp => sp.GetRequiredService<TDestination>());
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageDestination>(pipelineBuilder.PipelineName, (sp, _) => sp.GetRequiredService<TDestination>());
return pipelineBuilder;
}

Expand All @@ -113,7 +113,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureMessageDestination<TDesti
_ = Throw.IfNull(pipelineBuilder);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageDestination>(pipelineBuilder.PipelineName, implementationFactory);
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageDestination>(pipelineBuilder.PipelineName, (sp, _) => implementationFactory(sp));
return pipelineBuilder;
}

Expand All @@ -135,7 +135,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureMessageDestination<TDesti
_ = Throw.IfNullOrEmpty(name);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageDestination>(name, implementationFactory);
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageDestination>(name, (sp, _) => implementationFactory(sp));
return pipelineBuilder;
}

Expand All @@ -154,7 +154,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureMessageSource<TSource>(th
{
_ = Throw.IfNull(pipelineBuilder);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageSource>(pipelineBuilder.PipelineName, sp => sp.GetRequiredService<TSource>());
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageSource>(pipelineBuilder.PipelineName, (sp, _) => sp.GetRequiredService<TSource>());
return pipelineBuilder;
}

Expand All @@ -173,7 +173,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureMessageSource<TSource>(th
_ = Throw.IfNull(pipelineBuilder);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageSource>(pipelineBuilder.PipelineName, implementationFactory);
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageSource>(pipelineBuilder.PipelineName, (sp, _) => implementationFactory(sp));
return pipelineBuilder;
}

Expand All @@ -193,7 +193,7 @@ public static IAsyncProcessingPipelineBuilder AddMessageMiddleware<TMiddleware>(
{
_ = Throw.IfNull(pipelineBuilder);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName, sp => sp.GetRequiredService<TMiddleware>());
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName, (sp, _) => sp.GetRequiredService<TMiddleware>());
return pipelineBuilder;
}

Expand All @@ -215,7 +215,7 @@ public static IAsyncProcessingPipelineBuilder AddMessageMiddleware<TMiddleware>(
_ = Throw.IfNull(pipelineBuilder);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName, implementationFactory);
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName, (sk, _) => implementationFactory(sk));
return pipelineBuilder;
}

Expand All @@ -234,7 +234,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureTerminalMessageDelegate(t
{
_ = Throw.IfNull(pipelineBuilder);

_ = pipelineBuilder.Services.AddNamedSingleton(pipelineBuilder.PipelineName, sp => sp.GetRequiredService<MessageDelegate>());
_ = pipelineBuilder.Services.AddKeyedSingleton(pipelineBuilder.PipelineName, (sp, _) => sp.GetRequiredService<MessageDelegate>());
return pipelineBuilder;
}

Expand All @@ -256,7 +256,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureTerminalMessageDelegate(t
_ = Throw.IfNull(pipelineBuilder);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton(pipelineBuilder.PipelineName, implementationFactory);
_ = pipelineBuilder.Services.AddKeyedSingleton(pipelineBuilder.PipelineName, (sp, _) => implementationFactory(sp));
return pipelineBuilder;
}

Expand All @@ -275,7 +275,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureMessageConsumer<TConsumer
{
_ = Throw.IfNull(pipelineBuilder);

_ = pipelineBuilder.Services.AddNamedSingleton<MessageConsumer>(pipelineBuilder.PipelineName, sp => sp.GetRequiredService<TConsumer>());
_ = pipelineBuilder.Services.AddKeyedSingleton<MessageConsumer>(pipelineBuilder.PipelineName, (sp, _) => sp.GetRequiredService<TConsumer>());
return pipelineBuilder;
}

Expand All @@ -294,7 +294,7 @@ public static IAsyncProcessingPipelineBuilder ConfigureMessageConsumer<TConsumer
_ = Throw.IfNull(pipelineBuilder);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton<MessageConsumer>(pipelineBuilder.PipelineName, implementationFactory);
_ = pipelineBuilder.Services.AddKeyedSingleton<MessageConsumer>(pipelineBuilder.PipelineName, (sp, _) => implementationFactory(sp));
return pipelineBuilder;
}

Expand All @@ -313,8 +313,7 @@ public static void RunConsumerAsBackgroundService(this IAsyncProcessingPipelineB
_ = Throw.IfNull(pipelineBuilder);
_ = pipelineBuilder.Services.AddSingleton<IHostedService>(serviceProvider =>
{
INamedServiceProvider<MessageConsumer> namedMessageConsumerProvider = serviceProvider.GetRequiredService<INamedServiceProvider<MessageConsumer>>();
MessageConsumer messageConsumer = namedMessageConsumerProvider.GetRequiredService(pipelineBuilder.PipelineName);
MessageConsumer messageConsumer = serviceProvider.GetRequiredKeyedService<MessageConsumer>(pipelineBuilder.PipelineName);
return new ConsumerBackgroundService(messageConsumer);
});
}
Expand Down
6 changes: 3 additions & 3 deletions ...raries/System.Cloud.Messaging/DependencyInjection/Extensions/ServiceProviderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static IMessageSource GetMessageSource(this IServiceProvider serviceProvi
_ = Throw.IfNull(serviceProvider);
_ = Throw.IfNullOrEmpty(pipelineName);

return serviceProvider.GetRequiredService<INamedServiceProvider<IMessageSource>>().GetRequiredService(pipelineName);
return serviceProvider.GetRequiredKeyedService<IMessageSource>(pipelineName);
}

/// <summary>
Expand All @@ -45,7 +45,7 @@ public static IReadOnlyList<IMessageMiddleware> GetMessageMiddlewares(this IServ
_ = Throw.IfNull(serviceProvider);
_ = Throw.IfNullOrEmpty(pipelineName);

return serviceProvider.GetRequiredService<INamedServiceProvider<IMessageMiddleware>>().GetServices(pipelineName).ToList();
return serviceProvider.GetKeyedServices<IMessageMiddleware>(pipelineName).ToArray();
}

/// <summary>
Expand All @@ -61,6 +61,6 @@ public static MessageDelegate GetMessageDelegate(this IServiceProvider servicePr
_ = Throw.IfNull(serviceProvider);
_ = Throw.IfNullOrEmpty(pipelineName);

return serviceProvider.GetRequiredService<INamedServiceProvider<MessageDelegate>>().GetRequiredService(pipelineName);
return serviceProvider.GetRequiredKeyedService<MessageDelegate>(pipelineName);
}
}
10 changes: 5 additions & 5 deletions ...ries/System.Cloud.Messaging/Middlewares/Extensions/LatencyRecorderMiddlewareExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public static IAsyncProcessingPipelineBuilder AddLatencyContextMiddleware<T>(thi
_ = Throw.IfNull(implementationFactory);
_ = Throw.IfNull(exporterFactory);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName,
sp => new LatencyContextProviderMiddleware(implementationFactory(sp), exporterFactory(sp)));
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName,
(sp, _) => new LatencyContextProviderMiddleware(implementationFactory(sp), exporterFactory(sp)));
return pipelineBuilder;
}

Expand All @@ -73,8 +73,8 @@ public static IAsyncProcessingPipelineBuilder AddLatencyContextMiddleware<T>(thi
_ = Throw.IfNull(pipelineBuilder);
_ = Throw.IfNull(implementationFactory);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName,
sp => new LatencyContextMiddleware(implementationFactory(sp)));
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName,
(sp, _) => new LatencyContextMiddleware(implementationFactory(sp)));
return pipelineBuilder;
}

Expand All @@ -101,7 +101,7 @@ public static IAsyncProcessingPipelineBuilder AddLatencyRecorderMessageMiddlewar
_ = Throw.IfNull(successMeasureToken);
_ = Throw.IfNull(failureMeasureToken);

_ = pipelineBuilder.Services.AddNamedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName, sp => new LatencyRecorderMiddleware(successMeasureToken, failureMeasureToken));
_ = pipelineBuilder.Services.AddKeyedSingleton<IMessageMiddleware>(pipelineBuilder.PipelineName, (_, _) => new LatencyRecorderMiddleware(successMeasureToken, failureMeasureToken));
return pipelineBuilder;
}
}
1 change: 0 additions & 1 deletion src/Libraries/System.Cloud.Messaging/System.Cloud.Messaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\ToBeMoved\DependencyInjection.NamedService\DependencyInjection.NamedService.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
</ItemGroup>

Expand Down
Loading