From 427d4e4655fc10e346f71b0285fb835389fb6eb5 Mon Sep 17 00:00:00 2001 From: Ismail Mayat Date: Fri, 29 Jun 2018 10:16:47 +0100 Subject: [PATCH] update calls to the old factory which is now static --- .../Implement/ContentTypeRepositoryBase.cs | 18 +++++++----------- .../Implement/MemberTypeRepository.cs | 6 ++---- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs index d33980ac46..491d1cd9a3 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs @@ -119,8 +119,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected void PersistNewBaseContentType(IContentTypeComposition entity) { - var factory = new ContentTypeFactory(); - var dto = factory.BuildContentTypeDto(entity); + + var dto = ContentTypeFactory.BuildContentTypeDto(entity); //Cannot add a duplicate content type type var exists = Database.ExecuteScalar(@"SELECT COUNT(*) FROM cmsContentType @@ -235,8 +235,8 @@ AND umbracoNode.nodeObjectType = @objectType", protected void PersistUpdatedBaseContentType(IContentTypeComposition entity) { - var factory = new ContentTypeFactory(); - var dto = factory.BuildContentTypeDto(entity); + + var dto = ContentTypeFactory.BuildContentTypeDto(entity); // ensure the alias is not used already var exists = Database.ExecuteScalar(@"SELECT COUNT(*) FROM cmsContentType @@ -870,10 +870,8 @@ AND umbracoNode.id <> @id", } }; - //now create the content type object - - var factory = new ContentTypeFactory(); - var mediaType = factory.BuildMediaTypeEntity(contentTypeDto); + //now create the content type object; + var mediaType = ContentTypeFactory.BuildMediaTypeEntity(contentTypeDto); //map the allowed content types mediaType.AllowedContentTypes = currAllowedContentTypes; @@ -1052,9 +1050,7 @@ AND umbracoNode.id <> @id", }; //now create the content type object - - var factory = new ContentTypeFactory(); - var contentType = factory.BuildContentTypeEntity(dtDto.ContentTypeDto); + var contentType = ContentTypeFactory.BuildContentTypeEntity(dtDto.ContentTypeDto); // NOTE // that was done by the factory but makes little sense, moved here, so diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs index 3208cae41e..60b21f5634 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs @@ -212,14 +212,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement { entity.AddPropertyType(standardPropertyType.Value, Constants.Conventions.Member.StandardPropertiesGroupName); } - - var factory = new ContentTypeFactory(); - + EnsureExplicitDataTypeForBuiltInProperties(entity); PersistNewBaseContentType(entity); //Handles the MemberTypeDto (cmsMemberType table) - var memberTypeDtos = factory.BuildMemberTypeDtos(entity); + var memberTypeDtos = ContentTypeFactory.BuildMemberTypeDtos(entity); foreach (var memberTypeDto in memberTypeDtos) { Database.Insert(memberTypeDto);