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

Updates all repos to use IScopeUnitOfWork

Browse Source
This commit is contained in:
Shannon
2017-01-19 16:51:39 +11:00
parent 4f5347fa4d
commit 27eeb383b4
65 changed files with 123 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Persistence/LockingRepository.cs
View File

@@ -11,10 +11,10 @@ namespace Umbraco.Core.Persistence
where TRepository : IDisposable, IRepository
{
private readonly IScopeUnitOfWorkProvider _uowProvider;
private readonly Func<IDatabaseUnitOfWork, TRepository> _repositoryFactory;
private readonly Func<IScopeUnitOfWork, TRepository> _repositoryFactory;
private readonly int[] _readLockIds, _writeLockIds;
public LockingRepository(IScopeUnitOfWorkProvider uowProvider, Func<IDatabaseUnitOfWork, TRepository> repositoryFactory,
public LockingRepository(IScopeUnitOfWorkProvider uowProvider, Func<IScopeUnitOfWork, TRepository> repositoryFactory,
IEnumerable<int> readLockIds, IEnumerable<int> writeLockIds)
{
Mandate.ParameterNotNull(uowProvider, "uowProvider");

2
src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
View File

@@ -11,7 +11,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
internal class AuditRepository : PetaPocoRepositoryBase<int, AuditItem>, IAuditRepository
{
public AuditRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public AuditRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/ContentPreviewRepository.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal class ContentPreviewRepository<TContent> : PetaPocoRepositoryBase<int, ContentPreviewEntity<TContent>>
where TContent : IContentBase
{
public ContentPreviewRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public ContentPreviewRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
View File

@@ -31,7 +31,7 @@ namespace Umbraco.Core.Persistence.Repositories
private readonly ContentPreviewRepository<IContent> _contentPreviewRepository;
private readonly ContentXmlRepository<IContent> _contentXmlRepository;
public ContentRepository(IDatabaseUnitOfWork work, CacheHelper cacheHelper, ILogger logger, ISqlSyntaxProvider syntaxProvider, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, IContentSection contentSection)
public ContentRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, ISqlSyntaxProvider syntaxProvider, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, IContentSection contentSection)
: base(work, cacheHelper, logger, syntaxProvider, contentSection)
{
if (contentTypeRepository == null) throw new ArgumentNullException("contentTypeRepository");

2
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
View File

@@ -30,7 +30,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal abstract class ContentTypeBaseRepository<TEntity> : PetaPocoRepositoryBase<int, TEntity>, IReadRepository<Guid, TEntity>
where TEntity : class, IContentTypeComposition
{
protected ContentTypeBaseRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
protected ContentTypeBaseRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
private readonly ITemplateRepository _templateRepository;
public ContentTypeRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, ITemplateRepository templateRepository)
public ContentTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, ITemplateRepository templateRepository)
: base(work, cache, logger, sqlSyntax)
{
_templateRepository = templateRepository;

2
src/Umbraco.Core/Persistence/Repositories/ContentXmlRepository.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal class ContentXmlRepository<TContent> : PetaPocoRepositoryBase<int, ContentXmlEntity<TContent>>
where TContent : IContentBase
{
public ContentXmlRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public ContentXmlRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

4
src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Core.Persistence.Repositories
private readonly IContentTypeRepository _contentTypeRepository;
private readonly DataTypePreValueRepository _preValRepository;
public DataTypeDefinitionRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax,
public DataTypeDefinitionRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax,
IContentTypeRepository contentTypeRepository)
: base(work, cache, logger, sqlSyntax)
{
@@ -519,7 +519,7 @@ AND umbracoNode.id <> @id",
/// </summary>
private class DataTypePreValueRepository : PetaPocoRepositoryBase<int, PreValueEntity>
{
public DataTypePreValueRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public DataTypePreValueRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

6
src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence.Repositories
/// </summary>
internal class DictionaryRepository : PetaPocoRepositoryBase<int, IDictionaryItem>, IDictionaryRepository
{
public DictionaryRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider syntax)
public DictionaryRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider syntax)
: base(work, cache, logger, syntax)
{
}
@@ -293,7 +293,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
private readonly DictionaryRepository _dictionaryRepository;
public DictionaryByUniqueIdRepository(DictionaryRepository dictionaryRepository, IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public DictionaryByUniqueIdRepository(DictionaryRepository dictionaryRepository, IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
_dictionaryRepository = dictionaryRepository;
@@ -350,7 +350,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
private readonly DictionaryRepository _dictionaryRepository;
public DictionaryByKeyRepository(DictionaryRepository dictionaryRepository, IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public DictionaryByKeyRepository(DictionaryRepository dictionaryRepository, IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
_dictionaryRepository = dictionaryRepository;

2
src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
View File

@@ -18,7 +18,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal class DomainRepository : PetaPocoRepositoryBase<int, IDomain>, IDomainRepository
{
public DomainRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public DomainRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
private readonly Guid _containerObjectType;
public EntityContainerRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, Guid containerObjectType)
public EntityContainerRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, Guid containerObjectType)
: base(work, cache, logger, sqlSyntax)
{
var allowedContainers = new[] {Constants.ObjectTypes.DocumentTypeContainerGuid, Constants.ObjectTypes.MediaTypeContainerGuid, Constants.ObjectTypes.DataTypeContainerGuid};

2
src/Umbraco.Core/Persistence/Repositories/ExternalLoginRepository.cs
View File

@@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
internal class ExternalLoginRepository : PetaPocoRepositoryBase<int, IIdentityUserLogin>, IExternalLoginRepository
{
public ExternalLoginRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public ExternalLoginRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Core.Persistence.Repositories
/// </summary>
internal class LanguageRepository : PetaPocoRepositoryBase<int, ILanguage>, ILanguageRepository
{
public LanguageRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public LanguageRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/MacroRepository.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal class MacroRepository : PetaPocoRepositoryBase<int, IMacro>, IMacroRepository
{
public MacroRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public MacroRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
View File

@@ -28,7 +28,7 @@ namespace Umbraco.Core.Persistence.Repositories
private readonly ContentXmlRepository<IMedia> _contentXmlRepository;
private readonly ContentPreviewRepository<IMedia> _contentPreviewRepository;
public MediaRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IMediaTypeRepository mediaTypeRepository, ITagRepository tagRepository, IContentSection contentSection)
public MediaRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IMediaTypeRepository mediaTypeRepository, ITagRepository tagRepository, IContentSection contentSection)
: base(work, cache, logger, sqlSyntax, contentSection)
{
if (mediaTypeRepository == null) throw new ArgumentNullException("mediaTypeRepository");

2
src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal class MediaTypeRepository : ContentTypeBaseRepository<IMediaType>, IMediaTypeRepository
{
public MediaTypeRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public MediaTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

6
src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal class MemberGroupRepository : PetaPocoRepositoryBase<int, IMemberGroup>, IMemberGroupRepository
{
public MemberGroupRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public MemberGroupRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}
@@ -160,14 +160,14 @@ namespace Umbraco.Core.Persistence.Repositories
};
PersistNewItem(grp);
if (SavingMemberGroup.IsRaisedEventCancelled(new SaveEventArgs<IMemberGroup>(grp), this))
if (SavingMemberGroup.IsRaisedEventCancelled(new SaveEventArgs<IMemberGroup>(grp), this, UnitOfWork.EventManager))
{
return null;
}
transaction.Complete();
SavedMemberGroup.RaiseEvent(new SaveEventArgs<IMemberGroup>(grp), this);
SavedMemberGroup.RaiseEvent(new SaveEventArgs<IMemberGroup>(grp), this, UnitOfWork.EventManager);
return grp;
}

2
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Core.Persistence.Repositories
private readonly ContentXmlRepository<IMember> _contentXmlRepository;
private readonly ContentPreviewRepository<IMember> _contentPreviewRepository;
public MemberRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, ITagRepository tagRepository, IContentSection contentSection)
public MemberRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, ITagRepository tagRepository, IContentSection contentSection)
: base(work, cache, logger, sqlSyntax, contentSection)
{
if (memberTypeRepository == null) throw new ArgumentNullException("memberTypeRepository");

2
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal class MemberTypeRepository : ContentTypeBaseRepository<IMemberType>, IMemberTypeRepository
{
public MemberTypeRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public MemberTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs
View File

@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
internal class MigrationEntryRepository : PetaPocoRepositoryBase<int, IMigrationEntry>, IMigrationEntryRepository
{
public MigrationEntryRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public MigrationEntryRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

8
src/Umbraco.Core/Persistence/Repositories/PetaPocoRepositoryBase.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
public ISqlSyntaxProvider SqlSyntax { get; private set; }
protected PetaPocoRepositoryBase(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
protected PetaPocoRepositoryBase(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger)
{
if (sqlSyntax == null) throw new ArgumentNullException("sqlSyntax");
@@ -28,11 +28,11 @@ namespace Umbraco.Core.Persistence.Repositories
}
/// <summary>
/// Returns the database Unit of Work added to the repository
/// Returns the Scope Unit of Work added to the repository
/// </summary>
protected internal new IDatabaseUnitOfWork UnitOfWork
protected internal new IScopeUnitOfWork UnitOfWork
{
get { return (IDatabaseUnitOfWork)base.UnitOfWork; }
get { return (IScopeUnitOfWork)base.UnitOfWork; }
}
protected UmbracoDatabase Database

2
src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
View File

@@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
internal class PublicAccessRepository : PetaPocoRepositoryBase<Guid, PublicAccessEntry>, IPublicAccessRepository
{
public PublicAccessRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public PublicAccessRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{ }

2
src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
View File

@@ -18,7 +18,7 @@ namespace Umbraco.Core.Persistence.Repositories
internal abstract class RecycleBinRepository<TId, TEntity> : VersionableRepositoryBase<TId, TEntity>, IRecycleBinRepository<TEntity>
where TEntity : class, IUmbracoEntity
{
protected RecycleBinRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IContentSection contentSection)
protected RecycleBinRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IContentSection contentSection)
: base(work, cache, logger, sqlSyntax, contentSection)
{
}

2
src/Umbraco.Core/Persistence/Repositories/RedirectUrlRepository.cs
View File

@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
internal class RedirectUrlRepository : PetaPocoRepositoryBase<Guid, IRedirectUrl>, IRedirectUrlRepository
{
public RedirectUrlRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public RedirectUrlRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{ }

2
src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
private readonly IRelationTypeRepository _relationTypeRepository;
public RelationRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IRelationTypeRepository relationTypeRepository)
public RelationRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IRelationTypeRepository relationTypeRepository)
: base(work, cache, logger, sqlSyntax)
{
_relationTypeRepository = relationTypeRepository;

2
src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Core.Persistence.Repositories
/// </summary>
internal class RelationTypeRepository : PetaPocoRepositoryBase<int, IRelationType>, IRelationTypeRepository
{
public RelationTypeRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public RelationTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{ }

2
src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
private readonly ICacheProvider _staticCache;
public ServerRegistrationRepository(IDatabaseUnitOfWork work, ICacheProvider staticCache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public ServerRegistrationRepository(IScopeUnitOfWork work, ICacheProvider staticCache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, CacheHelper.CreateDisabledCacheHelper(), logger, sqlSyntax)
{
_staticCache = staticCache;

2
src/Umbraco.Core/Persistence/Repositories/SimpleGetRepository.cs
View File

@@ -18,7 +18,7 @@ namespace Umbraco.Core.Persistence.Repositories
where TDto: class
{
protected SimpleGetRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
protected SimpleGetRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/TagRepository.cs
View File

@@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
internal class TagRepository : PetaPocoRepositoryBase<int, ITag>, ITagRepository
{
internal TagRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
internal TagRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
View File

@@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
internal class TaskRepository : PetaPocoRepositoryBase<int, Task>, ITaskRepository
{
public TaskRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public TaskRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs
View File

@@ -13,7 +13,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
internal class TaskTypeRepository : PetaPocoRepositoryBase<int, TaskType>, ITaskTypeRepository
{
public TaskTypeRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public TaskTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
View File

@@ -34,7 +34,7 @@ namespace Umbraco.Core.Persistence.Repositories
private readonly ViewHelper _viewHelper;
private readonly MasterPageHelper _masterPageHelper;
internal TemplateRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IFileSystem masterpageFileSystem, IFileSystem viewFileSystem, ITemplatesSection templateConfig)
internal TemplateRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IFileSystem masterpageFileSystem, IFileSystem viewFileSystem, ITemplatesSection templateConfig)
: base(work, cache, logger, sqlSyntax)
{
_masterpagesFileSystem = masterpageFileSystem;

2
src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
View File

@@ -26,7 +26,7 @@ namespace Umbraco.Core.Persistence.Repositories
private readonly IUserTypeRepository _userTypeRepository;
private readonly CacheHelper _cacheHelper;
public UserRepository(IDatabaseUnitOfWork work, CacheHelper cacheHelper, ILogger logger, ISqlSyntaxProvider sqlSyntax, IUserTypeRepository userTypeRepository)
public UserRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, ISqlSyntaxProvider sqlSyntax, IUserTypeRepository userTypeRepository)
: base(work, cacheHelper, logger, sqlSyntax)
{
_userTypeRepository = userTypeRepository;

2
src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Persistence.Repositories
/// </summary>
internal class UserTypeRepository : PetaPocoRepositoryBase<int, IUserType>, IUserTypeRepository
{
public UserTypeRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
public UserTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
: base(work, cache, logger, sqlSyntax)
{
}

2
src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
private readonly IContentSection _contentSection;
protected VersionableRepositoryBase(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IContentSection contentSection)
protected VersionableRepositoryBase(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IContentSection contentSection)
: base(work, cache, logger, sqlSyntax)
{
_contentSection = contentSection;

58
src/Umbraco.Core/Persistence/RepositoryFactory.cs
View File

@@ -88,42 +88,42 @@ namespace Umbraco.Core.Persistence
#endregion
public virtual IExternalLoginRepository CreateExternalLoginRepository(IDatabaseUnitOfWork uow)
public virtual IExternalLoginRepository CreateExternalLoginRepository(IScopeUnitOfWork uow)
{
return new ExternalLoginRepository(uow,
_cacheHelper,
_logger, _sqlSyntax);
}
public virtual IPublicAccessRepository CreatePublicAccessRepository(IDatabaseUnitOfWork uow)
public virtual IPublicAccessRepository CreatePublicAccessRepository(IScopeUnitOfWork uow)
{
return new PublicAccessRepository(uow,
_cacheHelper,
_logger, _sqlSyntax);
}
public virtual ITaskRepository CreateTaskRepository(IDatabaseUnitOfWork uow)
public virtual ITaskRepository CreateTaskRepository(IScopeUnitOfWork uow)
{
return new TaskRepository(uow,
_noCache, //never cache
_logger, _sqlSyntax);
}
public virtual IAuditRepository CreateAuditRepository(IDatabaseUnitOfWork uow)
public virtual IAuditRepository CreateAuditRepository(IScopeUnitOfWork uow)
{
return new AuditRepository(uow,
_noCache, //never cache
_logger, _sqlSyntax);
}
public virtual ITagRepository CreateTagRepository(IDatabaseUnitOfWork uow)
public virtual ITagRepository CreateTagRepository(IScopeUnitOfWork uow)
{
return new TagRepository(
uow,
_cacheHelper, _logger, _sqlSyntax);
}
public virtual IContentRepository CreateContentRepository(IDatabaseUnitOfWork uow)
public virtual IContentRepository CreateContentRepository(IScopeUnitOfWork uow)
{
return new ContentRepository(
uow,
@@ -139,7 +139,7 @@ namespace Umbraco.Core.Persistence
};
}
public virtual IContentTypeRepository CreateContentTypeRepository(IDatabaseUnitOfWork uow)
public virtual IContentTypeRepository CreateContentTypeRepository(IScopeUnitOfWork uow)
{
return new ContentTypeRepository(
uow,
@@ -148,7 +148,7 @@ namespace Umbraco.Core.Persistence
CreateTemplateRepository(uow));
}
public virtual IDataTypeDefinitionRepository CreateDataTypeDefinitionRepository(IDatabaseUnitOfWork uow)
public virtual IDataTypeDefinitionRepository CreateDataTypeDefinitionRepository(IScopeUnitOfWork uow)
{
return new DataTypeDefinitionRepository(
uow,
@@ -157,7 +157,7 @@ namespace Umbraco.Core.Persistence
CreateContentTypeRepository(uow));
}
public virtual IDictionaryRepository CreateDictionaryRepository(IDatabaseUnitOfWork uow)
public virtual IDictionaryRepository CreateDictionaryRepository(IScopeUnitOfWork uow)
{
return new DictionaryRepository(
uow,
@@ -166,7 +166,7 @@ namespace Umbraco.Core.Persistence
_sqlSyntax);
}
public virtual ILanguageRepository CreateLanguageRepository(IDatabaseUnitOfWork uow)
public virtual ILanguageRepository CreateLanguageRepository(IScopeUnitOfWork uow)
{
return new LanguageRepository(
uow,
@@ -174,7 +174,7 @@ namespace Umbraco.Core.Persistence
_logger, _sqlSyntax);
}
public virtual IMediaRepository CreateMediaRepository(IDatabaseUnitOfWork uow)
public virtual IMediaRepository CreateMediaRepository(IScopeUnitOfWork uow)
{
return new MediaRepository(
uow,
@@ -185,7 +185,7 @@ namespace Umbraco.Core.Persistence
_settings.Content);
}
public virtual IMediaTypeRepository CreateMediaTypeRepository(IDatabaseUnitOfWork uow)
public virtual IMediaTypeRepository CreateMediaTypeRepository(IScopeUnitOfWork uow)
{
return new MediaTypeRepository(
uow,
@@ -193,7 +193,7 @@ namespace Umbraco.Core.Persistence
_logger, _sqlSyntax);
}
public virtual IRelationRepository CreateRelationRepository(IDatabaseUnitOfWork uow)
public virtual IRelationRepository CreateRelationRepository(IScopeUnitOfWork uow)
{
return new RelationRepository(
uow,
@@ -202,7 +202,7 @@ namespace Umbraco.Core.Persistence
CreateRelationTypeRepository(uow));
}
public virtual IRelationTypeRepository CreateRelationTypeRepository(IDatabaseUnitOfWork uow)
public virtual IRelationTypeRepository CreateRelationTypeRepository(IScopeUnitOfWork uow)
{
return new RelationTypeRepository(
uow,
@@ -230,7 +230,7 @@ namespace Umbraco.Core.Persistence
return new StylesheetRepository(uow, FileSystemProviderManager.Current.StylesheetsFileSystem);
}
public virtual ITemplateRepository CreateTemplateRepository(IDatabaseUnitOfWork uow)
public virtual ITemplateRepository CreateTemplateRepository(IScopeUnitOfWork uow)
{
return new TemplateRepository(uow,
_cacheHelper,
@@ -245,7 +245,7 @@ namespace Umbraco.Core.Persistence
return new XsltFileRepository(uow, FileSystemProviderManager.Current.XsltFileSystem);
}
public virtual IMigrationEntryRepository CreateMigrationEntryRepository(IDatabaseUnitOfWork uow)
public virtual IMigrationEntryRepository CreateMigrationEntryRepository(IScopeUnitOfWork uow)
{
return new MigrationEntryRepository(
uow,
@@ -253,7 +253,7 @@ namespace Umbraco.Core.Persistence
_logger, _sqlSyntax);
}
public virtual IServerRegistrationRepository CreateServerRegistrationRepository(IDatabaseUnitOfWork uow)
public virtual IServerRegistrationRepository CreateServerRegistrationRepository(IScopeUnitOfWork uow)
{
return new ServerRegistrationRepository(
uow,
@@ -261,7 +261,7 @@ namespace Umbraco.Core.Persistence
_logger, _sqlSyntax);
}
public virtual IUserTypeRepository CreateUserTypeRepository(IDatabaseUnitOfWork uow)
public virtual IUserTypeRepository CreateUserTypeRepository(IScopeUnitOfWork uow)
{
return new UserTypeRepository(
uow,
@@ -270,7 +270,7 @@ namespace Umbraco.Core.Persistence
_logger, _sqlSyntax);
}
public virtual IUserRepository CreateUserRepository(IDatabaseUnitOfWork uow)
public virtual IUserRepository CreateUserRepository(IScopeUnitOfWork uow)
{
return new UserRepository(
uow,
@@ -280,14 +280,14 @@ namespace Umbraco.Core.Persistence
CreateUserTypeRepository(uow));
}
internal virtual IMacroRepository CreateMacroRepository(IDatabaseUnitOfWork uow)
internal virtual IMacroRepository CreateMacroRepository(IScopeUnitOfWork uow)
{
return new MacroRepository(uow,
_cacheHelper,
_logger, _sqlSyntax);
}
public virtual IMemberRepository CreateMemberRepository(IDatabaseUnitOfWork uow)
public virtual IMemberRepository CreateMemberRepository(IScopeUnitOfWork uow)
{
return new MemberRepository(
uow,
@@ -299,38 +299,38 @@ namespace Umbraco.Core.Persistence
_settings.Content);
}
public virtual IMemberTypeRepository CreateMemberTypeRepository(IDatabaseUnitOfWork uow)
public virtual IMemberTypeRepository CreateMemberTypeRepository(IScopeUnitOfWork uow)
{
return new MemberTypeRepository(uow,
_cacheHelper,
_logger, _sqlSyntax);
}
public virtual IMemberGroupRepository CreateMemberGroupRepository(IDatabaseUnitOfWork uow)
public virtual IMemberGroupRepository CreateMemberGroupRepository(IScopeUnitOfWork uow)
{
return new MemberGroupRepository(uow,
_cacheHelper,
_logger, _sqlSyntax);
}
public virtual IEntityRepository CreateEntityRepository(IDatabaseUnitOfWork uow)
public virtual IEntityRepository CreateEntityRepository(IScopeUnitOfWork uow)
{
return new EntityRepository(uow);
}
public virtual IDomainRepository CreateDomainRepository(IDatabaseUnitOfWork uow)
public virtual IDomainRepository CreateDomainRepository(IScopeUnitOfWork uow)
{
return new DomainRepository(uow, _cacheHelper, _logger, _sqlSyntax);
}
public ITaskTypeRepository CreateTaskTypeRepository(IDatabaseUnitOfWork uow)
public ITaskTypeRepository CreateTaskTypeRepository(IScopeUnitOfWork uow)
{
return new TaskTypeRepository(uow,
_noCache, //never cache
_logger, _sqlSyntax);
}
internal virtual EntityContainerRepository CreateEntityContainerRepository(IDatabaseUnitOfWork uow, Guid containerObjectType)
internal virtual EntityContainerRepository CreateEntityContainerRepository(IScopeUnitOfWork uow, Guid containerObjectType)
{
return new EntityContainerRepository(
uow,
@@ -339,7 +339,7 @@ namespace Umbraco.Core.Persistence
containerObjectType);
}
public IRedirectUrlRepository CreateRedirectUrlRepository(IDatabaseUnitOfWork uow)
public IRedirectUrlRepository CreateRedirectUrlRepository(IScopeUnitOfWork uow)
{
return new RedirectUrlRepository(
uow,
@@ -348,7 +348,7 @@ namespace Umbraco.Core.Persistence
_sqlSyntax);
}
internal IStylesheetRepository CreateStylesheetRepository(IDatabaseUnitOfWork uow)
internal IStylesheetRepository CreateStylesheetRepository(IScopeUnitOfWork uow)
{
return new StylesheetRepository(uow, FileSystemProviderManager.Current.StylesheetsFileSystem);
}

2
src/Umbraco.Core/Persistence/UnitOfWork/IScopeUnitOfWork.cs
View File

@@ -2,7 +2,7 @@ using Umbraco.Core.Events;
namespace Umbraco.Core.Persistence.UnitOfWork
{
internal interface IScopeUnitOfWork : IDatabaseUnitOfWork
public interface IScopeUnitOfWork : IDatabaseUnitOfWork
{
IEventManager EventManager { get; }
}

2
src/Umbraco.Core/Persistence/UnitOfWork/IScopeUnitOfWorkProvider.cs
View File

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork
/// <summary>
/// Defines a Unit of Work Provider for working with <see cref="IScope"/>
/// </summary>
internal interface IScopeUnitOfWorkProvider : IDatabaseUnitOfWorkProvider
public interface IScopeUnitOfWorkProvider : IDatabaseUnitOfWorkProvider
{
new IScopeUnitOfWork GetUnitOfWork();
IScopeUnitOfWork GetUnitOfWork(IsolationLevel isolationLevel);

24
src/Umbraco.Core/Persistence/UnitOfWork/PetaPocoUnitOfWorkProvider.cs
View File

@@ -58,6 +58,12 @@ namespace Umbraco.Core.Persistence.UnitOfWork
#region Implementation of IUnitOfWorkProvider
//explicit implementation
IDatabaseUnitOfWork IDatabaseUnitOfWorkProvider.GetUnitOfWork()
{
return new PetaPocoUnitOfWork(_scopeProvider);
}
/// <summary>
/// Creates a Unit of work with a new UmbracoDatabase instance for the work item/transaction.
/// </summary>
@@ -67,13 +73,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork
/// the ApplicationContext.Current.DatabaseContext.Database. This is because each transaction should use it's own Database
/// and we Dispose of this Database object when the UOW is disposed.
/// </remarks>
public IDatabaseUnitOfWork GetUnitOfWork()
{
return new PetaPocoUnitOfWork(_scopeProvider);
}
//explicit implementation
IScopeUnitOfWork IScopeUnitOfWorkProvider.GetUnitOfWork()
public IScopeUnitOfWork GetUnitOfWork()
{
return new PetaPocoUnitOfWork(_scopeProvider);
}
@@ -86,15 +86,5 @@ namespace Umbraco.Core.Persistence.UnitOfWork
#endregion
/// <summary>
/// Static helper method to return a new unit of work
/// </summary>
/// <returns></returns>
internal static IDatabaseUnitOfWork CreateUnitOfWork(ILogger logger)
{
// fixme wtf?
var provider = new PetaPocoUnitOfWorkProvider(logger);
return provider.GetUnitOfWork();
}
}
}

4
src/Umbraco.Core/Services/PackagingService.cs
View File

@@ -40,7 +40,7 @@ namespace Umbraco.Core.Services
private readonly ILocalizationService _localizationService;
private readonly IEntityService _entityService;
private readonly RepositoryFactory _repositoryFactory;
private readonly IDatabaseUnitOfWorkProvider _uowProvider;
private readonly IScopeUnitOfWorkProvider _uowProvider;
private Dictionary<string, IContentType> _importedContentTypes;
private IPackageInstallation _packageInstallation;
private readonly IUserService _userService;
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Services
IEntityService entityService,
IUserService userService,
RepositoryFactory repositoryFactory,
IDatabaseUnitOfWorkProvider uowProvider)
IScopeUnitOfWorkProvider uowProvider)
{
_logger = logger;
_contentService = contentService;

2
src/Umbraco.Core/Services/ServerRegistrationService.cs
View File

@@ -31,7 +31,7 @@ namespace Umbraco.Core.Services
/// <param name="repositoryFactory">A repository factory.</param>
/// <param name="logger">A logger.</param>
/// <param name="eventMessagesFactory"></param>
public ServerRegistrationService(IDatabaseUnitOfWorkProvider uowProvider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory)
public ServerRegistrationService(IScopeUnitOfWorkProvider uowProvider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory)
: base(uowProvider, repositoryFactory, logger, eventMessagesFactory)
{
_lrepo = new LockingRepository<IServerRegistrationRepository>(UowProvider,

4
src/Umbraco.Core/Services/ServiceContext.cs
View File

@@ -161,7 +161,7 @@ namespace Umbraco.Core.Services
/// <param name="eventMessagesFactory"></param>
public ServiceContext(
RepositoryFactory repositoryFactory,
IDatabaseUnitOfWorkProvider dbUnitOfWorkProvider,
IScopeUnitOfWorkProvider dbUnitOfWorkProvider,
IUnitOfWorkProvider fileUnitOfWorkProvider,
BasePublishingStrategy publishingStrategy,
CacheHelper cache,
@@ -187,7 +187,7 @@ namespace Umbraco.Core.Services
/// Builds the various services
/// </summary>
private void BuildServiceCache(
IDatabaseUnitOfWorkProvider dbUnitOfWorkProvider,
IScopeUnitOfWorkProvider dbUnitOfWorkProvider,
IUnitOfWorkProvider fileUnitOfWorkProvider,
BasePublishingStrategy publishingStrategy,
CacheHelper cache,

6
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
View File

@@ -44,7 +44,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.TearDown();
}
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out DataTypeDefinitionRepository dtdRepository)
private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out DataTypeDefinitionRepository dtdRepository)
{
TemplateRepository tr;
var ctRepository = CreateRepository(unitOfWork, out contentTypeRepository, out tr);
@@ -52,13 +52,13 @@ namespace Umbraco.Tests.Persistence.Repositories
return ctRepository;
}
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
{
TemplateRepository tr;
return CreateRepository(unitOfWork, out contentTypeRepository, out tr);
}
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository)
private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository)
{
templateRepository = new TemplateRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger, SqlSyntax);

8
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
View File

@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.TearDown();
}
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
@@ -49,20 +49,20 @@ namespace Umbraco.Tests.Persistence.Repositories
return repository;
}
private ContentTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private ContentTypeRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
return contentTypeRepository;
}
private MediaTypeRepository CreateMediaTypeRepository(IDatabaseUnitOfWork unitOfWork)
private MediaTypeRepository CreateMediaTypeRepository(IScopeUnitOfWork unitOfWork)
{
var contentTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
return contentTypeRepository;
}
private EntityContainerRepository CreateContainerRepository(IDatabaseUnitOfWork unitOfWork, Guid containerEntityType)
private EntityContainerRepository CreateContainerRepository(IScopeUnitOfWork unitOfWork, Guid containerEntityType)
{
return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, containerEntityType);
}

4
src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
View File

@@ -31,7 +31,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.Initialize();
}
private DataTypeDefinitionRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private DataTypeDefinitionRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
var dataTypeDefinitionRepository = new DataTypeDefinitionRepository(
unitOfWork, CacheHelper.CreateDisabledCacheHelper(),
@@ -41,7 +41,7 @@ namespace Umbraco.Tests.Persistence.Repositories
return dataTypeDefinitionRepository;
}
private EntityContainerRepository CreateContainerRepository(IDatabaseUnitOfWork unitOfWork)
private EntityContainerRepository CreateContainerRepository(IScopeUnitOfWork unitOfWork)
{
return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Constants.ObjectTypes.DataTypeContainerGuid);
}

2
src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Persistence.Repositories
CreateTestData();
}
private DictionaryRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private DictionaryRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
var dictionaryRepository = new DictionaryRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), new SqlCeSyntaxProvider());
return dictionaryRepository;

2
src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Tests.Persistence.Repositories
[TestFixture]
public class DomainRepositoryTest : BaseDatabaseFactoryTest
{
private DomainRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out ContentRepository contentRepository, out LanguageRepository languageRepository)
private DomainRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out ContentRepository contentRepository, out LanguageRepository languageRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax);

2
src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
View File

@@ -26,7 +26,7 @@ namespace Umbraco.Tests.Persistence.Repositories
CreateTestData();
}
private LanguageRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private LanguageRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
return new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
}

2
src/Umbraco.Tests/Persistence/Repositories/LockedRepositoryTests.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Persistence.Repositories
[TestFixture]
public class LockedRepositoryTests : BaseDatabaseFactoryTest
{
private static IServerRegistrationRepository CreateRepository(IDatabaseUnitOfWork uow, ILogger logger, CacheHelper cacheHelper, ISqlSyntaxProvider sqlSyntax)
private static IServerRegistrationRepository CreateRepository(IScopeUnitOfWork uow, ILogger logger, CacheHelper cacheHelper, ISqlSyntaxProvider sqlSyntax)
{
return new ServerRegistrationRepository(
uow,

2
src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
View File

@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Persistence.Repositories
CreateTestData();
}
private MediaRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
private MediaRepository CreateRepository(IScopeUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
{
mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax);
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax);

4
src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
View File

@@ -26,12 +26,12 @@ namespace Umbraco.Tests.Persistence.Repositories
base.Initialize();
}
private MediaTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private MediaTypeRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
return new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
}
private EntityContainerRepository CreateContainerRepository(IDatabaseUnitOfWork unitOfWork)
private EntityContainerRepository CreateContainerRepository(IScopeUnitOfWork unitOfWork)
{
return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Constants.ObjectTypes.MediaTypeContainerGuid);
}

2
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
View File

@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.TearDown();
}
private MemberRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out MemberTypeRepository memberTypeRepository, out MemberGroupRepository memberGroupRepository)
private MemberRepository CreateRepository(IScopeUnitOfWork unitOfWork, out MemberTypeRepository memberTypeRepository, out MemberGroupRepository memberGroupRepository)
{
memberTypeRepository = new MemberTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
memberGroupRepository = new MemberGroupRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);

2
src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
View File

@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.TearDown();
}
private MemberTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private MemberTypeRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
return new MemberTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
}

2
src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
View File

@@ -225,7 +225,7 @@ namespace Umbraco.Tests.Persistence.Repositories
}
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger, SqlSyntax);

2
src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
View File

@@ -190,7 +190,7 @@ namespace Umbraco.Tests.Persistence.Repositories
}
}
private IRedirectUrlRepository CreateRepository(IDatabaseUnitOfWork uow)
private IRedirectUrlRepository CreateRepository(IScopeUnitOfWork uow)
{
return new RedirectUrlRepository(uow, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax);
}

2
src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs
View File

@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence.Repositories
CreateTestData();
}
private RelationRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out RelationTypeRepository relationTypeRepository)
private RelationRepository CreateRepository(IScopeUnitOfWork unitOfWork, out RelationTypeRepository relationTypeRepository)
{
relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
var repository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, relationTypeRepository);

2
src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Persistence.Repositories
CreateTestData();
}
private RelationTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private RelationTypeRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
return new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
}

2
src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
View File

@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence.Repositories
CreateTestData();
}
private ServerRegistrationRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private ServerRegistrationRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
return new ServerRegistrationRepository(unitOfWork, _staticCache, Mock.Of<ILogger>(), SqlSyntax);
}

6
src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.TearDown();
}
private TagRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private TagRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
return tagRepository;
@@ -1032,7 +1032,7 @@ namespace Umbraco.Tests.Persistence.Repositories
}
private ContentRepository CreateContentRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
private ContentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
@@ -1041,7 +1041,7 @@ namespace Umbraco.Tests.Persistence.Repositories
return repository;
}
private MediaRepository CreateMediaRepository(IDatabaseUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
private MediaRepository CreateMediaRepository(IScopeUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
{
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);

2
src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
View File

@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Persistence.Repositories
private IFileSystem _masterPageFileSystem;
private IFileSystem _viewsFileSystem;
private ITemplateRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, ITemplatesSection templatesSection = null)
private ITemplateRepository CreateRepository(IScopeUnitOfWork unitOfWork, ITemplatesSection templatesSection = null)
{
return new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, _masterPageFileSystem, _viewsFileSystem,
templatesSection ?? Mock.Of<ITemplatesSection>(t => t.DefaultRenderingEngine == RenderingEngine.Mvc));

2
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
View File

@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.TearDown();
}
private UserRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out UserTypeRepository userTypeRepository)
private UserRepository CreateRepository(IScopeUnitOfWork unitOfWork, out UserTypeRepository userTypeRepository)
{
userTypeRepository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
var repository = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, userTypeRepository);

2
src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
View File

@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.TearDown();
}
private UserTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private UserTypeRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
return new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
}

5
src/Umbraco.Tests/Services/ContentServiceTests.cs
View File

@@ -1469,7 +1469,8 @@ namespace Umbraco.Tests.Services
[Test]
public void Can_Save_Lazy_Content()
{
var unitOfWork = PetaPocoUnitOfWorkProvider.CreateUnitOfWork(Mock.Of<ILogger>());
var uowProvider = new PetaPocoUnitOfWorkProvider(Mock.Of<ILogger>());
var unitOfWork = uowProvider.GetUnitOfWork();
var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
var root = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 1);
@@ -1743,7 +1744,7 @@ namespace Umbraco.Tests.Services
return list;
}
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);

2
src/Umbraco.Tests/Templates/TemplateRepositoryTests.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Templates
[TestFixture]
public class TemplateRepositoryTests
{
private readonly Mock<IDatabaseUnitOfWork> _unitOfWorkMock = new Mock<IDatabaseUnitOfWork>();
private readonly Mock<IScopeUnitOfWork> _unitOfWorkMock = new Mock<IScopeUnitOfWork>();
private readonly Mock<CacheHelper> _cacheMock = new Mock<CacheHelper>();
private TemplateRepository _templateRepository;
private readonly Mock<IFileSystem> _viewFileSystemMock = new Mock<IFileSystem>();

2
src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
View File

@@ -393,7 +393,7 @@ namespace Umbraco.Tests.Web.Mvc
new Mock<IEntityService>().Object,
new Mock<IUserService>().Object,
new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), logger, Mock.Of<ISqlSyntaxProvider>(), umbracoSettings),
new Mock<IDatabaseUnitOfWorkProvider>().Object),
new Mock<IScopeUnitOfWorkProvider>().Object),
new Mock<IEntityService>().Object,
new RelationService(
new Mock<IDatabaseUnitOfWorkProvider>().Object,