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

Register instances instead of factory method with discard.

Browse Source
This commit is contained in:
Paul Johnson
2020-11-24 12:20:05 +00:00
parent 633c391f85
commit 7e9a13a4ab
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Composing/CompositionExtensions.cs
View File

@@ -36,7 +36,7 @@ namespace Umbraco.Infrastructure.PublishedCache
/// <param name="service">A published snapshot service.</param>
public static void SetPublishedSnapshotService(this IUmbracoBuilder builder, IPublishedSnapshotService service)
{
builder.Services.AddUnique(_ => service);
builder.Services.AddUnique(service);
}
}
}

14
src/Umbraco.Infrastructure/CompositionExtensions.cs
View File

@@ -135,7 +135,7 @@ namespace Umbraco.Core
/// <param name="factory">A factory.</param>
public static void SetCultureDictionaryFactory(this IUmbracoBuilder builder, ICultureDictionaryFactory factory)
{
builder.Services.AddUnique(_ => factory);
builder.Services.AddUnique(factory);
}
/// <summary>
@@ -166,7 +166,7 @@ namespace Umbraco.Core
/// <param name="factory">A published content model factory.</param>
public static void SetPublishedContentModelFactory(this IUmbracoBuilder builder, IPublishedModelFactory factory)
{
builder.Services.AddUnique(_ => factory);
builder.Services.AddUnique(factory);
}
/// <summary>
@@ -197,7 +197,7 @@ namespace Umbraco.Core
/// <param name="registrar">A server registrar.</param>
public static void SetServerRegistrar(this IUmbracoBuilder builder, IServerRegistrar registrar)
{
builder.Services.AddUnique(_ => registrar);
builder.Services.AddUnique(registrar);
}
/// <summary>
@@ -228,7 +228,7 @@ namespace Umbraco.Core
/// <param name="registrar">A server messenger.</param>
public static void SetServerMessenger(this IUmbracoBuilder builder, IServerMessenger registrar)
{
builder.Services.AddUnique(_ => registrar);
builder.Services.AddUnique(registrar);
}
/// <summary>
@@ -250,7 +250,7 @@ namespace Umbraco.Core
/// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
public static void SetDatabaseServerMessengerOptions(this IUmbracoBuilder builder, DatabaseServerMessengerCallbacks options)
{
builder.Services.AddUnique(_ => options);
builder.Services.AddUnique(options);
}
/// <summary>
@@ -281,7 +281,7 @@ namespace Umbraco.Core
/// <param name="helper">A short string helper.</param>
public static void SetShortStringHelper(this IUmbracoBuilder builder, IShortStringHelper helper)
{
builder.Services.AddUnique(_ => helper);
builder.Services.AddUnique(helper);
}
/// <summary>
@@ -327,7 +327,7 @@ namespace Umbraco.Core
/// <param name="helper">A log viewer.</param>
public static void SetLogViewer(this IUmbracoBuilder builder, ILogViewer viewer)
{
builder.Services.AddUnique(_ => viewer);
builder.Services.AddUnique(viewer);
}
#endregion

2
src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
View File

@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Cache
base.Compose(builder);
// refreshers.HandleEvents wants a UmbracoContext
// which wants these
builder.Services.AddUnique(_ => Mock.Of<IPublishedSnapshotService>());
builder.Services.AddUnique(Mock.Of<IPublishedSnapshotService>());
builder.WithCollectionBuilder<UrlProviderCollectionBuilder>();
}

2
src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs
View File

@@ -24,7 +24,7 @@ namespace Umbraco.Tests.PublishedContent
{
base.Compose();
Builder.Services.AddUnique(_ => GetServiceContext());
Builder.Services.AddUnique(GetServiceContext());
}
protected ServiceContext GetServiceContext()

2
src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
View File

@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Routing
{
base.Compose();
Builder.Services.AddUnique(_ => GetServiceContext());
Builder.Services.AddUnique(GetServiceContext());
}
protected ServiceContext GetServiceContext()

2
src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Tests.Routing
{
base.Compose();
Builder.Services.AddUnique(_ => Mock.Of<IDomainService>());
Builder.Services.AddUnique(Mock.Of<IDomainService>());
Builder.Services.AddTransient<ISiteDomainHelper, SiteDomainHelper>();
}

2
src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Routing
protected override void Compose()
{
base.Compose();
Builder.Services.AddUnique(_ => Mock.Of<IDomainService>());
Builder.Services.AddUnique(Mock.Of<IDomainService>());
Builder.Services.AddTransient<ISiteDomainHelper, SiteDomainHelper>();
}

4
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -307,8 +307,8 @@ namespace Umbraco.Tests.Testing
Umbraco.Web.Composing.Current.UmbracoContextAccessor = new TestUmbracoContextAccessor();
// web
Builder.Services.AddUnique(_ => Umbraco.Web.Composing.Current.UmbracoContextAccessor);
Builder.Services.AddUnique<IBackOfficeSecurityAccessor>(_ => new HybridBackofficeSecurityAccessor(AppCaches.NoCache.RequestCache));
Builder.Services.AddUnique(Current.UmbracoContextAccessor);
Builder.Services.AddUnique<IBackOfficeSecurityAccessor>(new HybridBackofficeSecurityAccessor(AppCaches.NoCache.RequestCache));
Builder.Services.AddUnique<IPublishedRouter, PublishedRouter>();
Builder.WithCollectionBuilder<ContentFinderCollectionBuilder>();

4
src/Umbraco.Web/CompositionExtensions.cs
View File

@@ -67,7 +67,7 @@ namespace Umbraco.Web
/// <param name="finder">A last chance finder.</param>
public static void SetContentLastChanceFinder(this IUmbracoBuilder builder, IContentLastChanceFinder finder)
{
builder.Services.AddUnique(_ => finder);
builder.Services.AddUnique(finder);
}
/// <summary>
@@ -98,7 +98,7 @@ namespace Umbraco.Web
/// <param name="helper">A helper.</param>
public static void SetSiteDomainHelper(this IUmbracoBuilder builder, ISiteDomainHelper helper)
{
builder.Services.AddUnique(_ => helper);
builder.Services.AddUnique(helper);
}
#endregion