Skip to content

Fix KeyedService.AnyKey support #245

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
khellang merged 3 commits into from
Jan 6, 2025
Merged

Fix KeyedService.AnyKey support #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3ab9dc
Add test
sunghwan2789 Jan 3, 2025
d9a46ca
Fix KeyedService.AnyKey support
sunghwan2789 Jan 3, 2025
80a5244
Use object.Equals instead
sunghwan2789 Jan 5, 2025
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
3 changes: 2 additions & 1 deletion src/Scrutor/DecorationStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ protected DecorationStrategy(Type serviceType, string? serviceKey)
public string? ServiceKey { get; }

public virtual bool CanDecorate(ServiceDescriptor descriptor) =>
string.Equals(ServiceKey, descriptor.ServiceKey as string, StringComparison.Ordinal) && CanDecorate(descriptor.ServiceType);
// object.Equals is used to support decorating services with object keys (e.g., KeyedService.AnyKey).
Equals(ServiceKey, descriptor.ServiceKey) && CanDecorate(descriptor.ServiceType);

protected abstract bool CanDecorate(Type serviceType);

Expand Down
20 changes: 20 additions & 0 deletions test/Scrutor.Tests/DecorationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,26 @@ public void ShouldAddServiceKeyToExistingServiceDescriptor()
Assert.EndsWith("+Decorated", key);
}

[Fact]
public void ShouldNotDecorateKeyedServiceWithNonKeyedDecorator()
{
var services = new ServiceCollection();

services.AddKeyedSingleton<IDecoratedService, OtherDecorated>(KeyedService.AnyKey);
services.AddSingleton<IDecoratedService, Decorated>();

services.Decorate<IDecoratedService, Decorator>();

var descriptors = services.GetDescriptors<IDecoratedService>();

Assert.Equal(3, descriptors.Length);

var nondecorated = descriptors.SingleOrDefault(x => x.IsKeyedService && x.KeyedImplementationType == typeof(OtherDecorated));

Assert.NotNull(nondecorated);
Assert.Equal(KeyedService.AnyKey, nondecorated.ServiceKey);
}

[Fact]
public void CanDecorateExistingInstance()
{
Expand Down