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

U4-6147 - refactor RepositoryFactory and all IUnitOfWork (in progress)

Browse Source
This commit is contained in:
Stephan
2016-04-28 08:48:59 +02:00
parent b0a33844b1
commit 8ab61039ed
52 changed files with 1295 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Umbraco.Core/DependencyInjection/RepositoryCompositionRoot.cs
View File

@@ -1,4 +1,3 @@
using System;
using LightInject;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
@@ -34,11 +33,8 @@ namespace Umbraco.Core.DependencyInjection
container.RegisterSingleton<DatabaseContext>();
// register IUnitOfWork providers
// using a factory for NPocoUnitOfWorkProvider because it has another ctor accepting
// one single parameter - we should get rid of it but it is used hundreds of times in
// unit tests and I am lazy
container.RegisterSingleton<IUnitOfWorkProvider, FileUnitOfWorkProvider>();
container.RegisterSingleton<IDatabaseUnitOfWorkProvider>(factory => new NPocoUnitOfWorkProvider(factory.GetInstance<IDatabaseFactory>()));
container.RegisterSingleton<IDatabaseUnitOfWorkProvider, NPocoUnitOfWorkProvider>();
// register mapping resover
// using a factory because... no time to clean it up at the moment
@@ -63,10 +59,14 @@ namespace Umbraco.Core.DependencyInjection
// the disabled one is used by those repositories that have an annotated ctor parameter
container.RegisterSingleton(factory => CacheHelper.CreateDisabledCacheHelper(), DisabledCache);
// register IDatabaseUnitOfWork
// resolve ctor dependency from GetInstance() runtimeArguments if possible
container.RegisterConstructorDependency((factory, info, runtimeArguments) =>
runtimeArguments.Length > 0 ? runtimeArguments[0] as IDatabaseUnitOfWork : null);
// resolve ctor dependency from GetInstance() runtimeArguments, if possible - 'factory' is
// the container, 'info' describes the ctor argument, and 'args' contains the args that
// were passed to GetInstance() - use first arg if it is the right type,
//
// for IDatabaseUnitOfWork
container.RegisterConstructorDependency((factory, info, args) => args.Length > 0 ? args[0] as IDatabaseUnitOfWork : null);
// for IUnitOfWork
container.RegisterConstructorDependency((factory, info, args) => args.Length > 0 ? args[0] as IUnitOfWork : null);
// register repositories
// repos depend on various things, and a IDatabaseUnitOfWork (registered above)
@@ -93,7 +93,6 @@ namespace Umbraco.Core.DependencyInjection
container.Register<IMemberGroupRepository, MemberGroupRepository>();
container.Register<IEntityRepository, EntityRepository>();
container.Register<IDomainRepository, DomainRepository>();
container.Register<EntityContainerRepository, EntityContainerRepository>();
container.Register<ITaskRepository, TaskRepository>();
container.Register<ITaskTypeRepository,TaskTypeRepository>();
container.Register<IAuditRepository, AuditRepository>();
@@ -101,12 +100,15 @@ namespace Umbraco.Core.DependencyInjection
container.Register<IRelationTypeRepository, RelationTypeRepository>();
container.Register<IMigrationEntryRepository, MigrationEntryRepository>();
container.Register<IServerRegistrationRepository, ServerRegistrationRepository>();
container.Register<IDocumentTypeContainerRepository, DocumentTypeContainerRepository>();
container.Register<IMediaTypeContainerRepository, MediaTypeContainerRepository>();
container.Register<IDataTypeContainerRepository, DataTypeContainerRepository>();
// repositories that depend on a filesystem
// these have an annotated ctor parameter to pick the right file system
container.Register<IScriptRepository, ScriptRepository>();
container.Register<IPartialViewRepository, PartialViewRepository>("PartialViewRepository");
container.Register<IPartialViewRepository, PartialViewMacroRepository>("PartialViewMacroRepository");
container.Register<IPartialViewRepository, PartialViewRepository>();
container.Register<IPartialViewMacroRepository, PartialViewMacroRepository>();
container.Register<IStylesheetRepository, StylesheetRepository>();
}
}