Rename DependencyInjection into DI, cleanup components, compose

This commit is contained in:
Stephan
2016-10-07 14:34:55 +02:00
parent 172ae81924
commit a00ee8d275
232 changed files with 1119 additions and 589 deletions

View File

@@ -1,13 +1,10 @@
using LightInject;
using Umbraco.Core;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Components;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Logging;
using Umbraco.Web.HealthCheck;
using Umbraco.Web.HealthCheck.Checks.DataIntegrity;
namespace Umbraco.Web.PublishedCache.XmlPublishedCache
@@ -15,23 +12,22 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
[DisableComponent] // is not enabled by default
public class XmlCacheComponent : UmbracoComponentBase, IUmbracoCoreComponent
{
public override void Compose(ServiceContainer container)
public override void Compose(Composition composition)
{
base.Compose(container);
base.Compose(composition);
// register the XML facade service
container.RegisterSingleton<IFacadeService>(factory => new FacadeService(
composition.SetFacadeService(factory => new FacadeService(
factory.GetInstance<ServiceContext>(),
factory.GetInstance<IDatabaseUnitOfWorkProvider>(),
factory.GetInstance<CacheHelper>().RequestCache,
factory.GetAllInstances<IUrlSegmentProvider>(),
factory.GetInstance<UrlSegmentProviderCollection>(),
factory.GetInstance<IFacadeAccessor>(),
factory.GetInstance<ILogger>(),
factory.GetInstance<MainDom>()));
// add the Xml cache health check (hidden from type finder)
var builder = container.GetInstance<HealthCheckCollectionBuilder>();
builder.Exclude<XmlDataIntegrityHealthCheck>();
composition.HealthChecks().Add<XmlDataIntegrityHealthCheck>();
}
public void Initialize(IFacadeService service)