From dbaede43afcac4ceb9b209f49e7535b2359380c8 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 2 May 2016 12:24:13 +0200 Subject: [PATCH] U4-6147 - GetUnitOfWork becomes CreateUnitOfWork --- .../UnitOfWork/FileUnitOfWorkProvider.cs | 2 +- .../UnitOfWork/IDatabaseUnitOfWorkProvider.cs | 14 ++- .../UnitOfWork/IUnitOfWorkProvider.cs | 8 +- .../UnitOfWork/NPocoUnitOfWorkProvider.cs | 2 +- src/Umbraco.Core/Services/AuditService.cs | 10 +- src/Umbraco.Core/Services/ContentService.cs | 104 +++++++++--------- .../Services/ContentTypeService.cs | 92 ++++++++-------- src/Umbraco.Core/Services/DataTypeService.cs | 46 ++++---- src/Umbraco.Core/Services/DomainService.cs | 14 +-- src/Umbraco.Core/Services/EntityService.cs | 38 +++---- .../Services/ExternalLoginService.cs | 8 +- src/Umbraco.Core/Services/FileService.cs | 78 ++++++------- .../Services/LocalizationService.cs | 34 +++--- src/Umbraco.Core/Services/MacroService.cs | 12 +- src/Umbraco.Core/Services/MediaService.cs | 66 +++++------ .../Services/MemberGroupService.cs | 10 +- src/Umbraco.Core/Services/MemberService.cs | 82 +++++++------- .../Services/MemberTypeService.cs | 16 +-- .../Services/MigrationEntryService.cs | 6 +- .../Services/NotificationService.cs | 14 +-- src/Umbraco.Core/Services/PackagingService.cs | 2 +- .../Services/PublicAccessService.cs | 12 +- src/Umbraco.Core/Services/RelationService.cs | 50 ++++----- .../Services/ServerRegistrationService.cs | 8 +- src/Umbraco.Core/Services/TagService.cs | 32 +++--- src/Umbraco.Core/Services/TaskService.cs | 18 +-- src/Umbraco.Core/Services/UserService.cs | 50 ++++----- .../Repositories/AuditRepositoryTest.cs | 2 +- .../Repositories/ContentRepositoryTest.cs | 56 +++++----- .../Repositories/ContentTypeRepositoryTest.cs | 56 +++++----- .../DataTypeDefinitionRepositoryTest.cs | 40 +++---- .../Repositories/DictionaryRepositoryTest.cs | 26 ++--- .../Repositories/DomainRepositoryTest.cs | 26 ++--- .../Repositories/LanguageRepositoryTest.cs | 24 ++-- .../Repositories/MacroRepositoryTest.cs | 36 +++--- .../Repositories/MediaRepositoryTest.cs | 42 +++---- .../Repositories/MediaTypeRepositoryTest.cs | 32 +++--- .../Repositories/MemberRepositoryTest.cs | 24 ++-- .../Repositories/MemberTypeRepositoryTest.cs | 22 ++-- .../NotificationsRepositoryTest.cs | 10 +- .../PartialViewRepositoryTests.cs | 2 +- .../PublicAccessRepositoryTest.cs | 16 +-- .../Repositories/RelationRepositoryTest.cs | 22 ++-- .../RelationTypeRepositoryTest.cs | 20 ++-- .../Repositories/ScriptRepositoryTest.cs | 20 ++-- .../ServerRegistrationRepositoryTest.cs | 20 ++-- .../Repositories/StylesheetRepositoryTest.cs | 22 ++-- .../Repositories/TagRepositoryTest.cs | 42 +++---- .../Repositories/TaskRepositoryTest.cs | 18 +-- .../Repositories/TaskTypeRepositoryTest.cs | 2 +- .../Repositories/TemplateRepositoryTest.cs | 44 ++++---- .../Repositories/UserRepositoryTest.cs | 34 +++--- .../Repositories/UserTypeRepositoryTest.cs | 22 ++-- .../Services/ContentServicePerformanceTest.cs | 8 +- .../Services/ContentServiceTests.cs | 20 ++-- .../Services/MacroServiceTests.cs | 2 +- .../Services/MediaServiceTests.cs | 2 +- .../Services/MemberServiceTests.cs | 2 +- src/Umbraco.Web/Services/SectionService.cs | 2 +- 59 files changed, 776 insertions(+), 768 deletions(-) diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/FileUnitOfWorkProvider.cs b/src/Umbraco.Core/Persistence/UnitOfWork/FileUnitOfWorkProvider.cs index 1a022c38ac..52f0b6cbe0 100644 --- a/src/Umbraco.Core/Persistence/UnitOfWork/FileUnitOfWorkProvider.cs +++ b/src/Umbraco.Core/Persistence/UnitOfWork/FileUnitOfWorkProvider.cs @@ -26,7 +26,7 @@ // careful, _repositoryFactory remains null! } - public IUnitOfWork GetUnitOfWork() + public IUnitOfWork CreateUnitOfWork() { return new FileUnitOfWork(_repositoryFactory); } diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWorkProvider.cs b/src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWorkProvider.cs index c18c08d8bb..2c1a261faa 100644 --- a/src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWorkProvider.cs +++ b/src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWorkProvider.cs @@ -1,10 +1,14 @@ namespace Umbraco.Core.Persistence.UnitOfWork { - /// - /// Defines a Unit of Work Provider for working with an IDatabaseUnitOfWork - /// - public interface IDatabaseUnitOfWorkProvider + /// + /// Represents a provider that can create units of work to work on databases. + /// + public interface IDatabaseUnitOfWorkProvider { - IDatabaseUnitOfWork GetUnitOfWork(); + /// + /// Creates a unit of work. + /// + /// A new unit of work. + IDatabaseUnitOfWork CreateUnitOfWork(); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/IUnitOfWorkProvider.cs b/src/Umbraco.Core/Persistence/UnitOfWork/IUnitOfWorkProvider.cs index 006bda0820..5e3f3c2881 100644 --- a/src/Umbraco.Core/Persistence/UnitOfWork/IUnitOfWorkProvider.cs +++ b/src/Umbraco.Core/Persistence/UnitOfWork/IUnitOfWorkProvider.cs @@ -1,10 +1,14 @@ namespace Umbraco.Core.Persistence.UnitOfWork { /// - /// Defines a Unit of Work Provider + /// Represents a provider that can create units of work. /// public interface IUnitOfWorkProvider { - IUnitOfWork GetUnitOfWork(); + /// + /// Creates a unit of work. + /// + /// A new unit of work. + IUnitOfWork CreateUnitOfWork(); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs b/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs index 8738812bc1..156d1df224 100644 --- a/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs +++ b/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs @@ -62,7 +62,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork /// /// A unit of work. /// The unit of work will execute on the database returned by the database factory. - public IDatabaseUnitOfWork GetUnitOfWork() + public IDatabaseUnitOfWork CreateUnitOfWork() { // get a database from the factory - might be the "ambient" database eg // the one that's enlisted with the HttpContext - so it's not always a diff --git a/src/Umbraco.Core/Services/AuditService.cs b/src/Umbraco.Core/Services/AuditService.cs index 76440cdef5..24a950a0b4 100644 --- a/src/Umbraco.Core/Services/AuditService.cs +++ b/src/Umbraco.Core/Services/AuditService.cs @@ -19,7 +19,7 @@ namespace Umbraco.Core.Services public void Add(AuditType type, string comment, int userId, int objectId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.AddOrUpdate(new AuditItem(objectId, comment, type, userId)); @@ -29,7 +29,7 @@ namespace Umbraco.Core.Services public IEnumerable GetLogs(int objectId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); var result = repo.GetByQuery(repo.Query.Where(x => x.Id == objectId)); @@ -39,7 +39,7 @@ namespace Umbraco.Core.Services public IEnumerable GetUserLogs(int userId, AuditType type, DateTime? sinceDate = null) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); var result = sinceDate.HasValue == false @@ -51,7 +51,7 @@ namespace Umbraco.Core.Services public IEnumerable GetLogs(AuditType type, DateTime? sinceDate = null) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); var result = sinceDate.HasValue == false @@ -63,7 +63,7 @@ namespace Umbraco.Core.Services public void CleanLogs(int maximumAgeOfLogsInMinutes) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.CleanLogs(maximumAgeOfLogsInMinutes); diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index 96571be802..6481caab7f 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -61,7 +61,7 @@ namespace Umbraco.Core.Services public int CountPublished(string contentTypeAlias = null) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.CountPublished(); @@ -70,7 +70,7 @@ namespace Umbraco.Core.Services public int Count(string contentTypeAlias = null) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Count(contentTypeAlias); @@ -79,7 +79,7 @@ namespace Umbraco.Core.Services public int CountChildren(int parentId, string contentTypeAlias = null) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.CountChildren(parentId, contentTypeAlias); @@ -88,7 +88,7 @@ namespace Umbraco.Core.Services public int CountDescendants(int parentId, string contentTypeAlias = null) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.CountDescendants(parentId, contentTypeAlias); @@ -102,7 +102,7 @@ namespace Umbraco.Core.Services /// public void ReplaceContentPermissions(EntityPermissionSet permissionSet) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.ReplaceContentPermissions(permissionSet); @@ -117,7 +117,7 @@ namespace Umbraco.Core.Services /// public void AssignContentPermission(IContent entity, char permission, IEnumerable userIds) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AssignEntityPermission(entity, permission, userIds); @@ -131,7 +131,7 @@ namespace Umbraco.Core.Services /// public IEnumerable GetPermissionsForEntity(IContent content) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetPermissionsForEntity(content.Id); @@ -171,7 +171,7 @@ namespace Umbraco.Core.Services Created.RaiseEvent(new NewEventArgs(content, false, contentTypeAlias, parentId), this); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.AddOrUpdate(new AuditItem(content.Id, $"Content '{name}' was created", AuditType.New, content.CreatorId)); @@ -254,7 +254,7 @@ namespace Umbraco.Core.Services content.CreatorId = userId; content.WriterId = userId; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdate(content); @@ -306,7 +306,7 @@ namespace Umbraco.Core.Services content.CreatorId = userId; content.WriterId = userId; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdate(content); @@ -328,7 +328,7 @@ namespace Umbraco.Core.Services /// public IContent GetById(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id); @@ -344,7 +344,7 @@ namespace Umbraco.Core.Services { if (ids.Any() == false) return Enumerable.Empty(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(ids.ToArray()); @@ -358,7 +358,7 @@ namespace Umbraco.Core.Services /// public IContent GetById(Guid key) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Key == key); @@ -374,7 +374,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetContentOfContentType(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ContentTypeId == id); @@ -386,7 +386,7 @@ namespace Umbraco.Core.Services internal IEnumerable GetPublishedContentOfContentType(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ContentTypeId == id); @@ -403,7 +403,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetByLevel(int level) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Level == level && !x.Path.StartsWith(Constants.System.RecycleBinContent.ToInvariantString())); @@ -420,7 +420,7 @@ namespace Umbraco.Core.Services /// An item public IContent GetByVersion(Guid versionId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetByVersion(versionId); @@ -435,7 +435,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetVersions(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var versions = repository.GetAllVersions(id); @@ -468,7 +468,7 @@ namespace Umbraco.Core.Services if (ids.Any() == false) return new List(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(ids); @@ -482,7 +482,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetChildren(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == id); @@ -526,7 +526,7 @@ namespace Umbraco.Core.Services { Mandate.ParameterCondition(pageIndex >= 0, "pageIndex"); Mandate.ParameterCondition(pageSize > 0, "pageSize"); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); @@ -574,7 +574,7 @@ namespace Umbraco.Core.Services { Mandate.ParameterCondition(pageIndex >= 0, "pageIndex"); Mandate.ParameterCondition(pageSize > 0, "pageSize"); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); @@ -598,7 +598,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetChildrenByName(int parentId, string name) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == parentId && x.Name.Contains(name)); @@ -630,7 +630,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetDescendants(IContent content) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var pathMatch = content.Path + ","; @@ -695,7 +695,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetRootContent() { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == Constants.System.Root); @@ -711,7 +711,7 @@ namespace Umbraco.Core.Services /// internal IEnumerable GetAllPublished() { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Trashed == false); @@ -725,7 +725,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetContentForExpiration() { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Published == true && x.ExpireDate <= DateTime.Now); @@ -741,7 +741,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetContentForRelease() { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Published == false && x.ReleaseDate <= DateTime.Now); @@ -757,7 +757,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetContentInRecycleBin() { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Path.Contains(Constants.System.RecycleBinContent.ToInvariantString())); @@ -781,7 +781,7 @@ namespace Umbraco.Core.Services internal int CountChildren(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == id); @@ -797,7 +797,7 @@ namespace Umbraco.Core.Services /// True if the content has any published version otherwise False public bool HasPublishedVersion(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Published == true && x.Id == id && x.Trashed == false); @@ -947,7 +947,7 @@ namespace Umbraco.Core.Services content.WriterId = userId; content.ChangeTrashedState(true); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdate(content); @@ -1097,7 +1097,7 @@ namespace Umbraco.Core.Services { var containsNew = asArray.Any(x => x.HasIdentity == false); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); if (containsNew) @@ -1172,7 +1172,7 @@ namespace Umbraco.Core.Services Delete(child, userId); } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.Delete(content); @@ -1245,7 +1245,7 @@ namespace Umbraco.Core.Services using (new WriteLock(Locker)) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); //NOTE What about content that has the contenttype as part of its composition? @@ -1305,7 +1305,7 @@ namespace Umbraco.Core.Services if (DeletingVersions.IsRaisedEventCancelled(new DeleteRevisionsEventArgs(id, dateToRetain: versionDate), this)) return; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.DeleteVersions(id, versionDate); @@ -1338,7 +1338,7 @@ namespace Umbraco.Core.Services DeleteVersions(id, content.UpdateDate, userId); } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.DeleteVersion(versionId); @@ -1415,7 +1415,7 @@ namespace Umbraco.Core.Services bool success; var nodeObjectType = new Guid(Constants.ObjectTypes.Document); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); //Create a dictionary of ids -> dictionary of property aliases + values @@ -1480,7 +1480,7 @@ namespace Umbraco.Core.Services if (Copying.IsRaisedEventCancelled(new CopyEventArgs(content, copy, parentId), this)) return null; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); // Update the create author and last edit author @@ -1572,7 +1572,7 @@ namespace Umbraco.Core.Services content.WriterId = userId; content.CreatorId = userId; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); content.ChangePublishedState(PublishedState.Unpublished); @@ -1613,7 +1613,7 @@ namespace Umbraco.Core.Services var asArray = items.ToArray(); using (new WriteLock(Locker)) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); int i = 0; @@ -1678,7 +1678,7 @@ namespace Umbraco.Core.Services /// public XElement GetContentXml(int contentId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetContentXml(contentId); @@ -1693,7 +1693,7 @@ namespace Umbraco.Core.Services /// public XElement GetContentPreviewXml(int contentId, Guid version) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetContentPreviewXml(contentId, version); @@ -1709,7 +1709,7 @@ namespace Umbraco.Core.Services /// public void RebuildXmlStructures(params int[] contentTypeIds) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.RebuildXmlStructures( @@ -1731,7 +1731,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects internal IEnumerable GetPublishedDescendants(IContent content) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Id != content.Id && x.Path.StartsWith(content.Path) && x.Trashed == false); @@ -1747,7 +1747,7 @@ namespace Umbraco.Core.Services private void Audit(AuditType type, string message, int userId, int objectId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.AddOrUpdate(new AuditItem(objectId, message, type, userId)); @@ -1801,7 +1801,7 @@ namespace Umbraco.Core.Services //TODO: This shouldn't be here! This needs to be part of the repository logic but in order to fix this we need to // change how this method calls "Save" as it needs to save using an internal method - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var xml = _entitySerializer.Serialize(this, _dataTypeService, _userService, _urlSegmentProviders, content); @@ -1898,7 +1898,7 @@ namespace Umbraco.Core.Services .OrderBy(x => x.Result.ContentItem.Level) .ThenBy(x => x.Result.ContentItem.SortOrder); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); //NOTE The Publish with subpages-dialog was used more as a republish-type-thing, so we'll have to include PublishStatusType.SuccessAlreadyPublished @@ -1953,7 +1953,7 @@ namespace Umbraco.Core.Services content.WriterId = userId; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdate(content); @@ -2021,7 +2021,7 @@ namespace Umbraco.Core.Services //we are successfully published if our publishStatus is still Successful bool published = publishStatus.StatusType == PublishStatusType.Success; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); if (published == false) @@ -2095,7 +2095,7 @@ namespace Umbraco.Core.Services using (new WriteLock(Locker)) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); if (content.HasIdentity == false) @@ -2207,7 +2207,7 @@ namespace Umbraco.Core.Services private IContentType FindContentTypeByAlias(string contentTypeAlias) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Alias == contentTypeAlias); diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs index bdbc84e4da..0beaa6f976 100644 --- a/src/Umbraco.Core/Services/ContentTypeService.cs +++ b/src/Umbraco.Core/Services/ContentTypeService.cs @@ -47,7 +47,7 @@ namespace Umbraco.Core.Services public Attempt> CreateContentTypeContainer(int parentId, string name, int userId = 0) { var evtMsgs = EventMessagesFactory.Get(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); try @@ -84,7 +84,7 @@ namespace Umbraco.Core.Services public Attempt> CreateMediaTypeContainer(int parentId, string name, int userId = 0) { var evtMsgs = EventMessagesFactory.Get(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); try @@ -160,7 +160,7 @@ namespace Umbraco.Core.Services return OperationStatus.Cancelled(evtMsgs); } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateContainerRepository(containerObjectType); repo.AddOrUpdate(container); @@ -186,7 +186,7 @@ namespace Umbraco.Core.Services private EntityContainer GetContainer(int containerId, Guid containerObjectType) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateContainerRepository(containerObjectType); var container = repo.Get(containerId); @@ -196,7 +196,7 @@ namespace Umbraco.Core.Services public IEnumerable GetMediaTypeContainers(int[] containerIds) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.GetAll(containerIds); @@ -205,7 +205,7 @@ namespace Umbraco.Core.Services public IEnumerable GetMediaTypeContainers(string name, int level) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return ((EntityContainerRepository) repo).Get(name, level); @@ -234,7 +234,7 @@ namespace Umbraco.Core.Services public IEnumerable GetContentTypeContainers(int[] containerIds) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.GetAll(containerIds); @@ -263,7 +263,7 @@ namespace Umbraco.Core.Services private EntityContainer GetContainer(Guid containerId, Guid containerObjectType) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateContainerRepository(containerObjectType); var container = ((EntityContainerRepository)repo).Get(containerId); @@ -273,7 +273,7 @@ namespace Umbraco.Core.Services public IEnumerable GetContentTypeContainers(string name, int level) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return ((EntityContainerRepository)repo).Get(name, level); @@ -283,7 +283,7 @@ namespace Umbraco.Core.Services public Attempt DeleteContentTypeContainer(int containerId, int userId = 0) { var evtMsgs = EventMessagesFactory.Get(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); var container = repo.Get(containerId); @@ -309,7 +309,7 @@ namespace Umbraco.Core.Services public Attempt DeleteMediaTypeContainer(int containerId, int userId = 0) { var evtMsgs = EventMessagesFactory.Get(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); var container = repo.Get(containerId); @@ -340,7 +340,7 @@ namespace Umbraco.Core.Services /// public IEnumerable GetAllPropertyTypeAliases() { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAllPropertyTypeAliases(); @@ -357,7 +357,7 @@ namespace Umbraco.Core.Services /// public IEnumerable GetAllContentTypeAliases(params Guid[] objectTypes) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAllContentTypeAliases(objectTypes); @@ -454,7 +454,7 @@ namespace Umbraco.Core.Services /// public IContentType GetContentType(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id); @@ -468,7 +468,7 @@ namespace Umbraco.Core.Services /// public IContentType GetContentType(string alias) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(alias); @@ -482,7 +482,7 @@ namespace Umbraco.Core.Services /// public IContentType GetContentType(Guid id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id); @@ -496,7 +496,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetAllContentTypes(params int[] ids) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(ids); @@ -510,7 +510,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetAllContentTypes(IEnumerable ids) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(ids.ToArray()); @@ -524,7 +524,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetContentTypeChildren(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == id); @@ -540,7 +540,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetContentTypeChildren(Guid id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var found = GetContentType(id); @@ -558,7 +558,7 @@ namespace Umbraco.Core.Services /// True if the content type has any children otherwise False public bool HasChildren(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == id); @@ -574,7 +574,7 @@ namespace Umbraco.Core.Services /// True if the content type has any children otherwise False public bool HasChildren(Guid id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var found = GetContentType(id); @@ -627,7 +627,7 @@ namespace Umbraco.Core.Services public int CountContentTypes() { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Count(repository.Query); @@ -636,7 +636,7 @@ namespace Umbraco.Core.Services public int CountMediaTypes() { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Count(repository.Query); @@ -737,7 +737,7 @@ namespace Umbraco.Core.Services using (new WriteLock(Locker)) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); ValidateLocked(contentType); // throws if invalid @@ -767,7 +767,7 @@ namespace Umbraco.Core.Services using (new WriteLock(Locker)) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); // all-or-nothing, validate them all first @@ -813,7 +813,7 @@ namespace Umbraco.Core.Services _contentService.DeleteContentOfType(contentType.Id); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.Delete(contentType); @@ -848,7 +848,7 @@ namespace Umbraco.Core.Services _contentService.DeleteContentOfType(contentType.Id); } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); foreach (var contentType in asArray) @@ -872,7 +872,7 @@ namespace Umbraco.Core.Services /// public IMediaType GetMediaType(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id); @@ -886,7 +886,7 @@ namespace Umbraco.Core.Services /// public IMediaType GetMediaType(string alias) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(alias); @@ -900,7 +900,7 @@ namespace Umbraco.Core.Services /// public IMediaType GetMediaType(Guid id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id); @@ -914,7 +914,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetAllMediaTypes(params int[] ids) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(ids); @@ -928,7 +928,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetAllMediaTypes(IEnumerable ids) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(ids.ToArray()); @@ -942,7 +942,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetMediaTypeChildren(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == id); @@ -958,7 +958,7 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetMediaTypeChildren(Guid id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var found = GetMediaType(id); @@ -976,7 +976,7 @@ namespace Umbraco.Core.Services /// True if the media type has any children otherwise False public bool MediaTypeHasChildren(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == id); @@ -992,7 +992,7 @@ namespace Umbraco.Core.Services /// True if the media type has any children otherwise False public bool MediaTypeHasChildren(Guid id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var found = GetMediaType(id); @@ -1017,7 +1017,7 @@ namespace Umbraco.Core.Services } var moveInfo = new List>(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var containerRepository = uow.CreateRepository(); var repository = uow.CreateRepository(); @@ -1061,7 +1061,7 @@ namespace Umbraco.Core.Services } var moveInfo = new List>(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var containerRepository = uow.CreateRepository(); var repository = uow.CreateRepository(); @@ -1096,7 +1096,7 @@ namespace Umbraco.Core.Services var evtMsgs = EventMessagesFactory.Get(); IMediaType copy; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var containerRepository = uow.CreateRepository(); var repository = uow.CreateRepository(); @@ -1139,7 +1139,7 @@ namespace Umbraco.Core.Services var evtMsgs = EventMessagesFactory.Get(); IContentType copy; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var containerRepository = uow.CreateRepository(); var repository = uow.CreateRepository(); @@ -1189,7 +1189,7 @@ namespace Umbraco.Core.Services using (new WriteLock(Locker)) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); ValidateLocked(mediaType); // throws if invalid @@ -1220,7 +1220,7 @@ namespace Umbraco.Core.Services using (new WriteLock(Locker)) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); // all-or-nothing, validate them all first @@ -1259,7 +1259,7 @@ namespace Umbraco.Core.Services { _mediaService.DeleteMediaOfType(mediaType.Id, userId); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); @@ -1292,7 +1292,7 @@ namespace Umbraco.Core.Services _mediaService.DeleteMediaOfType(mediaType.Id); } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); foreach (var mediaType in asArray) @@ -1357,7 +1357,7 @@ namespace Umbraco.Core.Services private void Audit(AuditType type, string message, int userId, int objectId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.AddOrUpdate(new AuditItem(objectId, message, type, userId)); diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs index 35b5c6869b..91523130fb 100644 --- a/src/Umbraco.Core/Services/DataTypeService.cs +++ b/src/Umbraco.Core/Services/DataTypeService.cs @@ -32,7 +32,7 @@ namespace Umbraco.Core.Services public Attempt> CreateContainer(int parentId, string name, int userId = 0) { var evtMsgs = EventMessagesFactory.Get(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); try @@ -68,7 +68,7 @@ namespace Umbraco.Core.Services public EntityContainer GetContainer(int containerId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); var container = repo.Get(containerId); @@ -78,7 +78,7 @@ namespace Umbraco.Core.Services public EntityContainer GetContainer(Guid containerId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); var container = ((EntityContainerRepository)repo).Get(containerId); @@ -88,7 +88,7 @@ namespace Umbraco.Core.Services public IEnumerable GetContainers(string name, int level) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return ((EntityContainerRepository)repo).Get(name, level); @@ -112,7 +112,7 @@ namespace Umbraco.Core.Services public IEnumerable GetContainers(int[] containerIds) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.GetAll(containerIds); @@ -142,7 +142,7 @@ namespace Umbraco.Core.Services return OperationStatus.Cancelled(evtMsgs); } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.AddOrUpdate(container); @@ -159,7 +159,7 @@ namespace Umbraco.Core.Services public Attempt DeleteContainer(int containerId, int userId = 0) { var evtMsgs = EventMessagesFactory.Get(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); var container = repo.Get(containerId); @@ -191,7 +191,7 @@ namespace Umbraco.Core.Services /// public IDataTypeDefinition GetDataTypeDefinitionByName(string name) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetByQuery(repository.Query.Where(x => x.Name == name)).FirstOrDefault(); @@ -205,7 +205,7 @@ namespace Umbraco.Core.Services /// public IDataTypeDefinition GetDataTypeDefinitionById(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id); @@ -219,7 +219,7 @@ namespace Umbraco.Core.Services /// public IDataTypeDefinition GetDataTypeDefinitionById(Guid id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.Key == id); @@ -235,7 +235,7 @@ namespace Umbraco.Core.Services /// Collection of objects with a matching contorl id public IEnumerable GetDataTypeDefinitionByPropertyEditorAlias(string propertyEditorAlias) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.PropertyEditorAlias == propertyEditorAlias); @@ -251,7 +251,7 @@ namespace Umbraco.Core.Services /// An enumerable list of objects public IEnumerable GetAllDataTypeDefinitions(params int[] ids) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(ids); @@ -265,7 +265,7 @@ namespace Umbraco.Core.Services /// An enumerable list of string values public IEnumerable GetPreValuesByDataTypeId(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var collection = repository.GetPreValuesCollectionByDataTypeId(id); @@ -284,7 +284,7 @@ namespace Umbraco.Core.Services /// public PreValueCollection GetPreValuesCollectionByDataTypeId(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetPreValuesCollectionByDataTypeId(id); @@ -298,7 +298,7 @@ namespace Umbraco.Core.Services /// PreValue as a string public string GetPreValueAsString(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetPreValueAsString(id); @@ -319,7 +319,7 @@ namespace Umbraco.Core.Services } var moveInfo = new List>(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var containerRepository = uow.CreateRepository(); var repository = uow.CreateRepository(); @@ -361,7 +361,7 @@ namespace Umbraco.Core.Services dataTypeDefinition.CreatorId = userId; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdate(dataTypeDefinition); @@ -396,7 +396,7 @@ namespace Umbraco.Core.Services return; } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); foreach (var dataTypeDefinition in dataTypeDefinitions) @@ -423,7 +423,7 @@ namespace Umbraco.Core.Services { //TODO: Should we raise an event here since we are really saving values for the data type? - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { using (var transaction = uow.Database.GetTransaction()) { @@ -480,7 +480,7 @@ namespace Umbraco.Core.Services { //TODO: Should we raise an event here since we are really saving values for the data type? - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdatePreValues(dataTypeDefinition, values); @@ -501,7 +501,7 @@ namespace Umbraco.Core.Services dataTypeDefinition.CreatorId = userId; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdate(dataTypeDefinition); // definition @@ -528,7 +528,7 @@ namespace Umbraco.Core.Services if (Deleting.IsRaisedEventCancelled(new DeleteEventArgs(dataTypeDefinition), this)) return; - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.Delete(dataTypeDefinition); @@ -542,7 +542,7 @@ namespace Umbraco.Core.Services private void Audit(AuditType type, string message, int userId, int objectId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.AddOrUpdate(new AuditItem(objectId, message, type, userId)); diff --git a/src/Umbraco.Core/Services/DomainService.cs b/src/Umbraco.Core/Services/DomainService.cs index dff2b564e4..9100fb9511 100644 --- a/src/Umbraco.Core/Services/DomainService.cs +++ b/src/Umbraco.Core/Services/DomainService.cs @@ -20,7 +20,7 @@ namespace Umbraco.Core.Services public bool Exists(string domainName) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.Exists(domainName); @@ -37,7 +37,7 @@ namespace Umbraco.Core.Services return OperationStatus.Cancelled(evtMsgs); } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.Delete(domain); @@ -51,7 +51,7 @@ namespace Umbraco.Core.Services public IDomain GetByName(string name) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetByName(name); @@ -60,7 +60,7 @@ namespace Umbraco.Core.Services public IDomain GetById(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.Get(id); @@ -69,7 +69,7 @@ namespace Umbraco.Core.Services public IEnumerable GetAll(bool includeWildcards) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.GetAll(includeWildcards); @@ -78,7 +78,7 @@ namespace Umbraco.Core.Services public IEnumerable GetAssignedDomains(int contentId, bool includeWildcards) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.GetAssignedDomains(contentId, includeWildcards); @@ -95,7 +95,7 @@ namespace Umbraco.Core.Services return OperationStatus.Cancelled(evtMsgs); } - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdate(domainEntity); diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs index 8768a8394f..e18e9056f9 100644 --- a/src/Umbraco.Core/Services/EntityService.cs +++ b/src/Umbraco.Core/Services/EntityService.cs @@ -74,7 +74,7 @@ namespace Umbraco.Core.Services { var result = _runtimeCache.GetCacheItem(CacheKeys.IdToKeyCacheKey + key, () => { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { switch (umbracoObjectType) { @@ -117,7 +117,7 @@ namespace Umbraco.Core.Services { var result = _runtimeCache.GetCacheItem(CacheKeys.KeyToIdCacheKey + id, () => { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { switch (umbracoObjectType) { @@ -153,7 +153,7 @@ namespace Umbraco.Core.Services { if (loadBaseType) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetByKey(key); @@ -184,7 +184,7 @@ namespace Umbraco.Core.Services { if (loadBaseType) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id); @@ -204,7 +204,7 @@ namespace Umbraco.Core.Services if (loadBaseType) { var objectTypeId = umbracoObjectType.GetGuid(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetByKey(key, objectTypeId); @@ -236,7 +236,7 @@ namespace Umbraco.Core.Services if (loadBaseType) { var objectTypeId = umbracoObjectType.GetGuid(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id, objectTypeId); @@ -269,7 +269,7 @@ namespace Umbraco.Core.Services { if (loadBaseType) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(id); @@ -294,7 +294,7 @@ namespace Umbraco.Core.Services /// An public virtual IUmbracoEntity GetParent(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var entity = repository.Get(id); @@ -313,7 +313,7 @@ namespace Umbraco.Core.Services /// An public virtual IUmbracoEntity GetParent(int id, UmbracoObjectTypes umbracoObjectType) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var entity = repository.Get(id); @@ -332,7 +332,7 @@ namespace Umbraco.Core.Services /// An enumerable list of objects public virtual IEnumerable GetChildren(int parentId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == parentId); @@ -351,7 +351,7 @@ namespace Umbraco.Core.Services public virtual IEnumerable GetChildren(int parentId, UmbracoObjectTypes umbracoObjectType) { var objectTypeId = umbracoObjectType.GetGuid(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == parentId); @@ -368,7 +368,7 @@ namespace Umbraco.Core.Services /// An enumerable list of objects public virtual IEnumerable GetDescendents(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var entity = repository.Get(id); @@ -389,7 +389,7 @@ namespace Umbraco.Core.Services public virtual IEnumerable GetDescendents(int id, UmbracoObjectTypes umbracoObjectType) { var objectTypeId = umbracoObjectType.GetGuid(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var entity = repository.Get(id); @@ -408,7 +408,7 @@ namespace Umbraco.Core.Services public virtual IEnumerable GetRootEntities(UmbracoObjectTypes umbracoObjectType) { var objectTypeId = umbracoObjectType.GetGuid(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); var query = repository.Query.Where(x => x.ParentId == -1); @@ -453,7 +453,7 @@ namespace Umbraco.Core.Services }); var objectTypeId = umbracoObjectType.GetGuid(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(objectTypeId, ids); @@ -471,7 +471,7 @@ namespace Umbraco.Core.Services }); var objectTypeId = umbracoObjectType.GetGuid(); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(objectTypeId, keys); @@ -495,7 +495,7 @@ namespace Umbraco.Core.Services ("The passed in type is not supported"); }); - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(objectTypeId, ids); @@ -509,7 +509,7 @@ namespace Umbraco.Core.Services /// public virtual UmbracoObjectTypes GetObjectType(int id) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var sql = uow.Database.Sql() .Select("nodeObjectType") @@ -528,7 +528,7 @@ namespace Umbraco.Core.Services /// public virtual UmbracoObjectTypes GetObjectType(Guid key) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var sql = uow.Database.Sql() .Select("nodeObjectType") diff --git a/src/Umbraco.Core/Services/ExternalLoginService.cs b/src/Umbraco.Core/Services/ExternalLoginService.cs index 4bfa8beae8..c97ec85717 100644 --- a/src/Umbraco.Core/Services/ExternalLoginService.cs +++ b/src/Umbraco.Core/Services/ExternalLoginService.cs @@ -22,7 +22,7 @@ namespace Umbraco.Core.Services /// public IEnumerable GetAll(int userId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.GetByQuery(repo.Query.Where(x => x.UserId == userId)); @@ -37,7 +37,7 @@ namespace Umbraco.Core.Services /// public IEnumerable Find(UserLoginInfo login) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); return repo.GetByQuery(repo.Query @@ -52,7 +52,7 @@ namespace Umbraco.Core.Services /// public void SaveUserLogins(int userId, IEnumerable logins) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.SaveUserLogins(userId, logins); @@ -66,7 +66,7 @@ namespace Umbraco.Core.Services /// public void DeleteUserLogins(int userId) { - using (var uow = UowProvider.GetUnitOfWork()) + using (var uow = UowProvider.CreateUnitOfWork()) { var repo = uow.CreateRepository(); repo.DeleteUserLogins(userId); diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs index a6553d5537..79ed338a5d 100644 --- a/src/Umbraco.Core/Services/FileService.cs +++ b/src/Umbraco.Core/Services/FileService.cs @@ -49,7 +49,7 @@ namespace Umbraco.Core.Services /// An enumerable list of objects public IEnumerable GetStylesheets(params string[] names) { - using (var uow = _fileUowProvider.GetUnitOfWork()) + using (var uow = _fileUowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.GetAll(names); @@ -63,7 +63,7 @@ namespace Umbraco.Core.Services /// A object public Stylesheet GetStylesheetByName(string name) { - using (var uow = _fileUowProvider.GetUnitOfWork()) + using (var uow = _fileUowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.Get(name); @@ -80,7 +80,7 @@ namespace Umbraco.Core.Services if (SavingStylesheet.IsRaisedEventCancelled(new SaveEventArgs(stylesheet), this)) return; - using (var uow = _fileUowProvider.GetUnitOfWork()) + using (var uow = _fileUowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); repository.AddOrUpdate(stylesheet); @@ -99,7 +99,7 @@ namespace Umbraco.Core.Services public void DeleteStylesheet(string path, int userId = 0) { Stylesheet stylesheet; - using (var uow = _fileUowProvider.GetUnitOfWork()) + using (var uow = _fileUowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); stylesheet = repository.Get(path); @@ -123,7 +123,7 @@ namespace Umbraco.Core.Services /// True if Stylesheet is valid, otherwise false public bool ValidateStylesheet(Stylesheet stylesheet) { - using (var uow = _fileUowProvider.GetUnitOfWork()) + using (var uow = _fileUowProvider.CreateUnitOfWork()) { var repository = uow.CreateRepository(); return repository.ValidateStylesheet(stylesheet); @@ -139,7 +139,7 @@ namespace Umbraco.Core.Services /// An enumerable list of objects public IEnumerable