From f343d98391594f8ce469c3a7d47563fde278b8e5 Mon Sep 17 00:00:00 2001
From: Ismail Mayat <imayat@thecogworks.co.uk>
Date: Fri, 29 Jun 2018 14:38:50 +0100
Subject: [PATCH] make static

---
 .../Factories/PublicAccessEntryFactory.cs     |  9 ++++-----
 .../Implement/PublicAccessRepository.cs       | 20 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/PublicAccessEntryFactory.cs b/src/Umbraco.Core/Persistence/Factories/PublicAccessEntryFactory.cs
index 90ce4f68bb..2a469e4624 100644
--- a/src/Umbraco.Core/Persistence/Factories/PublicAccessEntryFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PublicAccessEntryFactory.cs
@@ -1,13 +1,12 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Core.Persistence.Factories
 {
-    internal class PublicAccessEntryFactory
+    internal static class PublicAccessEntryFactory
     {
-        public PublicAccessEntry BuildEntity(AccessDto dto)
+        public static PublicAccessEntry BuildEntity(AccessDto dto)
         {
             var entity = new PublicAccessEntry(dto.Id, dto.NodeId, dto.LoginNodeId, dto.NoAccessNodeId,
                 dto.Rules.Select(x => new PublicAccessRule(x.Id, x.AccessId)
@@ -27,7 +26,7 @@ namespace Umbraco.Core.Persistence.Factories
             return entity;
         }
 
-        public AccessDto BuildDto(PublicAccessEntry entity)
+        public static AccessDto BuildDto(PublicAccessEntry entity)
         {
             var dto = new AccessDto
             {
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
index 61b094eb78..f49905573d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
@@ -39,10 +39,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             }
 
             sql.OrderBy<AccessDto>(x => x.NodeId);
-
-            var factory = new PublicAccessEntryFactory();
+            
             var dtos = Database.FetchOneToMany<AccessDto>(x => x.Rules, sql);
-            return dtos.Select(factory.BuildEntity);
+            return dtos.Select(PublicAccessEntryFactory.BuildEntity);
         }
 
         protected override IEnumerable<PublicAccessEntry> PerformGetByQuery(IQuery<PublicAccessEntry> query)
@@ -50,10 +49,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var sqlClause = GetBaseQuery(false);
             var translator = new SqlTranslator<PublicAccessEntry>(sqlClause, query);
             var sql = translator.Translate();
-
-            var factory = new PublicAccessEntryFactory();
+            
             var dtos = Database.FetchOneToMany<AccessDto>(x => x.Rules, sql);
-            return dtos.Select(factory.BuildEntity);
+            return dtos.Select(PublicAccessEntryFactory.BuildEntity);
         }
 
        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
@@ -87,9 +85,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             entity.AddingEntity();
             foreach (var rule in entity.Rules)
                 rule.AddingEntity();
-
-            var factory = new PublicAccessEntryFactory();
-            var dto = factory.BuildDto(entity);
+            
+            var dto = PublicAccessEntryFactory.BuildDto(entity);
 
             Database.Insert(dto);
             //update the id so HasEntity is correct
@@ -118,9 +115,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 else
                     rule.AddingEntity();
             }
-
-            var factory = new PublicAccessEntryFactory();
-            var dto = factory.BuildDto(entity);
+            
+            var dto = PublicAccessEntryFactory.BuildDto(entity);
 
             Database.Update(dto);