yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makes public the WeightedPluginAttribute, uses this for resolving the startup handlers so they could be sorted, adds special event to allow modifying the startup handlers.

Browse Source
This commit is contained in:
Shannon
2016-11-24 11:20:01 +01:00
parent e9b2175506
commit ed37b84b3b
4 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
View File

@@ -13,7 +13,7 @@ namespace Umbraco.Core.ObjectResolution
/// <remarks>
/// This is disposable because after the app has started it should be disposed to release any memory being occupied by instances.
/// </remarks>
internal sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>, IDisposable
public sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>, IDisposable
{
private readonly LegacyStartupHandlerResolver _legacyResolver;
@@ -30,7 +30,7 @@ namespace Umbraco.Core.ObjectResolution
//create the legacy resolver and only include the legacy types
_legacyResolver = new LegacyStartupHandlerResolver(
serviceProvider, logger,
applicationEventHandlers.Where(x => !TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>(x)));
applicationEventHandlers.Where(x => TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>(x) == false));
}
/// <summary>
@@ -42,14 +42,34 @@ namespace Umbraco.Core.ObjectResolution
get { return base.InstanceTypes.Where(TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>); }
}
/// <summary>
/// Gets the <see cref="IApplicationEventHandler"/> implementations.
/// </summary>
public IEnumerable<IApplicationEventHandler> ApplicationEventHandlers
private List<IApplicationEventHandler> _orderedAndFiltered;
/// <summary>
/// Gets the <see cref="IApplicationEventHandler"/> implementations.
/// </summary>
public IEnumerable<IApplicationEventHandler> ApplicationEventHandlers
{
get { return Values; }
get
{
if (_orderedAndFiltered == null)
{
_orderedAndFiltered = GetSortedValues().ToList();
//raise event so the collection can be modified
OnCollectionResolved(new ApplicationEventsEventArgs(_orderedAndFiltered));
}
return _orderedAndFiltered;
}
}
public event EventHandler<ApplicationEventsEventArgs> CollectionResolved;
private void OnCollectionResolved(ApplicationEventsEventArgs e)
{
var handler = CollectionResolved;
if (handler != null) handler(this, e);
}
/// <summary>
/// Create instances of all of the legacy startup handlers
/// </summary>
@@ -146,7 +166,14 @@ namespace Umbraco.Core.ObjectResolution
{
_legacyResolver.Dispose();
ResetCollections();
_orderedAndFiltered.Clear();
_orderedAndFiltered = null;
//Clear event handlers
CollectionResolved = null;
}
}
}
}