Skip to content
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

Jump to bottom

Fixes #1108 - Stop secondary invocation of OnActivating() handlers with decorated instance #1110

Merged
merged 6 commits into from
Apr 29, 2020
Merged

Fixes #1108 - Stop secondary invocation of OnActivating() handlers with decorated instance #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fd324a
Issue #1108
VonOgre Apr 25, 2020
3b56ee8
Spec unit tests to show behavior of OnActivating and OnActivated with…
VonOgre Apr 25, 2020
d3cc52f
Add basic tests to ensure appropriate counts of lifetime event invoca…
VonOgre Apr 28, 2020
70df799
More involved test cases around lifetime events and resolving IEnumer…
VonOgre Apr 28, 2020
1bb9bde
Test for Activating ReplaceInstance()
VonOgre Apr 28, 2020
bf902af
Merging updates from Autofac
VonOgre Apr 28, 2020
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: 0 additions & 3 deletions src/Autofac/Core/Resolving/InstanceLookup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ public object Execute()
_activationScope,
resolveParameters);

if (instance != decoratorTarget)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless I'm missing something specific, you wouldn't actually want to raise the Activating event again for the same registration, but specify the decorated instance. CreateInstance() already raises Activating for the original, so this block that's removed is a secondary occurrence only happening with decorators in play.

ComponentRegistration.RaiseActivating(this, resolveParameters, ref instance);

var handler = InstanceLookupEnding;
handler?.Invoke(this, new InstanceLookupEndingEventArgs(this, NewInstanceActivated));

Expand Down
86 changes: 86 additions & 0 deletions test/Autofac.Specification.Test/Features/DecoratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,92 @@ public void ResolvesDecoratedServiceWhenSingleDecoratorRegistered()
Assert.IsType<ImplementorA>(instance.Decorated);
}

[Fact]
public void ResolvesDecoratedServiceWhenTargetHasOnActivatingHandlerOnType()
{
var activatingInstances = new List<object>();

var builder = new ContainerBuilder();

builder.RegisterType<ImplementorA>().As<IDecoratedService>()
.OnActivating(args => activatingInstances.Add(args.Instance));
builder.RegisterDecorator<DecoratorA, IDecoratedService>();
var container = builder.Build();

var instance = container.Resolve<IDecoratedService>();

Assert.IsType<DecoratorA>(instance);
Assert.IsType<ImplementorA>(instance.Decorated);

Assert.Single(activatingInstances);
Assert.IsType<ImplementorA>(activatingInstances[0]);
}

[Fact]
public void ResolvesDecoratedServiceWhenTargetHasOnActivatingHandlerOnInterface()
{
var activatingInstances = new List<object>();

var builder = new ContainerBuilder();

builder.RegisterType<ImplementorA>().AsSelf();
builder.Register<IDecoratedService>(c => c.Resolve<ImplementorA>())
.OnActivating(args => activatingInstances.Add(args.Instance));
builder.RegisterDecorator<DecoratorA, IDecoratedService>();
var container = builder.Build();

var instance = container.Resolve<IDecoratedService>();

Assert.IsType<DecoratorA>(instance);
Assert.IsType<ImplementorA>(instance.Decorated);

Assert.Single(activatingInstances);
Assert.IsType<ImplementorA>(activatingInstances[0]);
}

[Fact]
public void ResolvesDecoratedServiceWhenTargetHasOnActivatedHandlerOnType()
{
var activatedInstances = new List<object>();

var builder = new ContainerBuilder();

builder.RegisterType<ImplementorA>().As<IDecoratedService>()
.OnActivated(args => activatedInstances.Add(args.Instance));
builder.RegisterDecorator<DecoratorA, IDecoratedService>();
var container = builder.Build();

var instance = container.Resolve<IDecoratedService>();

Assert.IsType<DecoratorA>(instance);
Assert.IsType<ImplementorA>(instance.Decorated);

Assert.Single(activatedInstances);
Assert.IsType<ImplementorA>(activatedInstances[0]);
}

[Fact]
public void ResolvesDecoratedServiceWhenTargetHasOnActivatedHandlerOnInterface()
{
var activatedInstances = new List<object>();

var builder = new ContainerBuilder();

builder.RegisterType<ImplementorA>().AsSelf();
builder.Register<IDecoratedService>(c => c.Resolve<ImplementorA>())
.OnActivated(args => activatedInstances.Add(args.Instance));
builder.RegisterDecorator<DecoratorA, IDecoratedService>();
var container = builder.Build();

var instance = container.Resolve<IDecoratedService>();

Assert.IsType<DecoratorA>(instance);
Assert.IsType<ImplementorA>(instance.Decorated);

Assert.Single(activatedInstances);
Assert.IsType<ImplementorA>(activatedInstances[0]);
}

[Fact]
public void StartableTypesCanBeDecorated()
{
Expand Down
Loading