From 4f4dc922e0d981c0709dadcc1ab44eddd2229b89 Mon Sep 17 00:00:00 2001
From: Ismail Mayat <imayat@thecogworks.co.uk>
Date: Fri, 29 Jun 2018 12:09:47 +0100
Subject: [PATCH] server registration now static

---
 .../Factories/ServerRegistrationFactory.cs    | 68 +++++++++----------
 .../Implement/ServerRegistrationRepository.cs | 11 ++-
 2 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/ServerRegistrationFactory.cs b/src/Umbraco.Core/Persistence/Factories/ServerRegistrationFactory.cs
index 5b0a42ad7b..c49c3968ed 100644
--- a/src/Umbraco.Core/Persistence/Factories/ServerRegistrationFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ServerRegistrationFactory.cs
@@ -1,34 +1,34 @@
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Dtos;
-
-namespace Umbraco.Core.Persistence.Factories
-{
-    internal class ServerRegistrationFactory
-    {
-        public ServerRegistration BuildEntity(ServerRegistrationDto dto)
-        {
-            var model = new ServerRegistration(dto.Id, dto.ServerAddress, dto.ServerIdentity, dto.DateRegistered, dto.DateAccessed, dto.IsActive, dto.IsMaster);
-            // reset dirty initial properties (U4-1946)
-            model.ResetDirtyProperties(false);
-            return model;
-        }
-
-        public ServerRegistrationDto BuildDto(IServerRegistration entity)
-        {
-            var dto = new ServerRegistrationDto
-            {
-                ServerAddress = entity.ServerAddress,
-                DateRegistered = entity.CreateDate,
-                IsActive = entity.IsActive,
-                IsMaster = ((ServerRegistration) entity).IsMaster,
-                DateAccessed = entity.UpdateDate,
-                ServerIdentity = entity.ServerIdentity
-            };
-
-            if (entity.HasIdentity)
-                dto.Id = entity.Id;
-
-            return dto;
-        }
-    }
-}
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Persistence.Factories
+{
+    internal static class ServerRegistrationFactory
+    {
+        public static ServerRegistration BuildEntity(ServerRegistrationDto dto)
+        {
+            var model = new ServerRegistration(dto.Id, dto.ServerAddress, dto.ServerIdentity, dto.DateRegistered, dto.DateAccessed, dto.IsActive, dto.IsMaster);
+            // reset dirty initial properties (U4-1946)
+            model.ResetDirtyProperties(false);
+            return model;
+        }
+
+        public static ServerRegistrationDto BuildDto(IServerRegistration entity)
+        {
+            var dto = new ServerRegistrationDto
+            {
+                ServerAddress = entity.ServerAddress,
+                DateRegistered = entity.CreateDate,
+                IsActive = entity.IsActive,
+                IsMaster = ((ServerRegistration) entity).IsMaster,
+                DateAccessed = entity.UpdateDate,
+                ServerIdentity = entity.ServerIdentity
+            };
+
+            if (entity.HasIdentity)
+                dto.Id = entity.Id;
+
+            return dto;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
index 88051c2134..531df1ba13 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
@@ -56,9 +56,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override IEnumerable<IServerRegistration> PerformGetAll(params int[] ids)
         {
-            var factory = new ServerRegistrationFactory();
             return Database.Fetch<ServerRegistrationDto>("WHERE id > 0")
-                .Select(x => factory.BuildEntity(x));
+                .Select(x => ServerRegistrationFactory.BuildEntity(x));
         }
 
         protected override IEnumerable<IServerRegistration> PerformGetByQuery(IQuery<IServerRegistration> query)
@@ -100,8 +99,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             ((ServerRegistration)entity).AddingEntity();
 
-            var factory = new ServerRegistrationFactory();
-            var dto = factory.BuildDto(entity);
+            var dto = ServerRegistrationFactory.BuildDto(entity);
 
             var id = Convert.ToInt32(Database.Insert(dto));
             entity.Id = id;
@@ -112,9 +110,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected override void PersistUpdatedItem(IServerRegistration entity)
         {
             ((ServerRegistration)entity).UpdatingEntity();
-
-            var factory = new ServerRegistrationFactory();
-            var dto = factory.BuildDto(entity);
+            
+            var dto = ServerRegistrationFactory.BuildDto(entity);
 
             Database.Update(dto);