From 26c4fc339f3fcadebd80cef86ff2787a368ec469 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@barend.se>
Date: Wed, 8 Sep 2021 17:01:34 +0200
Subject: [PATCH] Move extension method classes into separate files

---
 .../ContentEditing/PropertyGroupBasic.cs      |  6 --
 .../PropertyGroupBasicExtensions.cs           |  8 ++
 src/Umbraco.Core/Models/PropertyGroup.cs      | 81 ------------------
 .../Models/PropertyGroupExtensions.cs         | 83 +++++++++++++++++++
 4 files changed, 91 insertions(+), 87 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasicExtensions.cs
 create mode 100644 src/Umbraco.Core/Models/PropertyGroupExtensions.cs

diff --git a/src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasic.cs b/src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasic.cs
index d2089f38d4..46af8be3d6 100644
--- a/src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasic.cs
+++ b/src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasic.cs
@@ -63,10 +63,4 @@ namespace Umbraco.Cms.Core.Models.ContentEditing
         [DataMember(Name = "properties")]
         public IEnumerable<TPropertyType> Properties { get; set; }
     }
-
-    internal static class PropertyGroupBasicExtensions
-    {
-        public static string GetParentAlias(this PropertyGroupBasic propertyGroup)
-            => PropertyGroupExtensions.GetParentAlias(propertyGroup.Alias);
-    }
 }
diff --git a/src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasicExtensions.cs b/src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasicExtensions.cs
new file mode 100644
index 0000000000..c037de50d6
--- /dev/null
+++ b/src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasicExtensions.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Cms.Core.Models.ContentEditing
+{
+    internal static class PropertyGroupBasicExtensions
+    {
+        public static string GetParentAlias(this PropertyGroupBasic propertyGroup)
+            => PropertyGroupExtensions.GetParentAlias(propertyGroup.Alias);
+    }
+}
diff --git a/src/Umbraco.Core/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs
index b63ea59de2..3c86c064e7 100644
--- a/src/Umbraco.Core/Models/PropertyGroup.cs
+++ b/src/Umbraco.Core/Models/PropertyGroup.cs
@@ -147,85 +147,4 @@ namespace Umbraco.Cms.Core.Models
             }
         }
     }
-
-    public static class PropertyGroupExtensions
-    {
-        private const char aliasSeparator = '/';
-
-        internal static string GetLocalAlias(string alias)
-        {
-            var lastIndex = alias?.LastIndexOf(aliasSeparator) ?? -1;
-            if (lastIndex != -1)
-            {
-                return alias.Substring(lastIndex + 1);
-            }
-
-            return alias;
-        }
-
-        internal static string GetParentAlias(string alias)
-        {
-            var lastIndex = alias?.LastIndexOf(aliasSeparator) ?? -1;
-            if (lastIndex == -1)
-            {
-                return null;
-            }
-
-            return alias.Substring(0, lastIndex);
-        }
-
-        /// <summary>
-        /// Gets the local alias.
-        /// </summary>
-        /// <param name="propertyGroup">The property group.</param>
-        /// <returns>
-        /// The local alias.
-        /// </returns>
-        public static string GetLocalAlias(this PropertyGroup propertyGroup) => GetLocalAlias(propertyGroup.Alias);
-
-        /// <summary>
-        /// Updates the local alias.
-        /// </summary>
-        /// <param name="propertyGroup">The property group.</param>
-        /// <param name="localAlias">The local alias.</param>
-        public static void UpdateLocalAlias(this PropertyGroup propertyGroup, string localAlias)
-        {
-            var parentAlias = propertyGroup.GetParentAlias();
-            if (string.IsNullOrEmpty(parentAlias))
-            {
-                propertyGroup.Alias = localAlias;
-            }
-            else
-            {
-                propertyGroup.Alias = parentAlias + aliasSeparator + localAlias;
-            }
-        }
-
-        /// <summary>
-        /// Gets the parent alias.
-        /// </summary>
-        /// <param name="propertyGroup">The property group.</param>
-        /// <returns>
-        /// The parent alias.
-        /// </returns>
-        public static string GetParentAlias(this PropertyGroup propertyGroup) => GetParentAlias(propertyGroup.Alias);
-
-        /// <summary>
-        /// Updates the parent alias.
-        /// </summary>
-        /// <param name="propertyGroup">The property group.</param>
-        /// <param name="parentAlias">The parent alias.</param>
-        public static void UpdateParentAlias(this PropertyGroup propertyGroup, string parentAlias)
-        {
-            var localAlias = propertyGroup.GetLocalAlias();
-            if (string.IsNullOrEmpty(parentAlias))
-            {
-                propertyGroup.Alias = localAlias;
-            }
-            else
-            {
-                propertyGroup.Alias = parentAlias + aliasSeparator + localAlias;
-            }
-        }
-    }
 }
diff --git a/src/Umbraco.Core/Models/PropertyGroupExtensions.cs b/src/Umbraco.Core/Models/PropertyGroupExtensions.cs
new file mode 100644
index 0000000000..f8f94c06ab
--- /dev/null
+++ b/src/Umbraco.Core/Models/PropertyGroupExtensions.cs
@@ -0,0 +1,83 @@
+namespace Umbraco.Cms.Core.Models
+{
+    public static class PropertyGroupExtensions
+    {
+        private const char AliasSeparator = '/';
+
+        internal static string GetLocalAlias(string alias)
+        {
+            var lastIndex = alias?.LastIndexOf(AliasSeparator) ?? -1;
+            if (lastIndex != -1)
+            {
+                return alias.Substring(lastIndex + 1);
+            }
+
+            return alias;
+        }
+
+        internal static string GetParentAlias(string alias)
+        {
+            var lastIndex = alias?.LastIndexOf(AliasSeparator) ?? -1;
+            if (lastIndex == -1)
+            {
+                return null;
+            }
+
+            return alias.Substring(0, lastIndex);
+        }
+
+        /// <summary>
+        /// Gets the local alias.
+        /// </summary>
+        /// <param name="propertyGroup">The property group.</param>
+        /// <returns>
+        /// The local alias.
+        /// </returns>
+        public static string GetLocalAlias(this PropertyGroup propertyGroup) => GetLocalAlias(propertyGroup.Alias);
+
+        /// <summary>
+        /// Updates the local alias.
+        /// </summary>
+        /// <param name="propertyGroup">The property group.</param>
+        /// <param name="localAlias">The local alias.</param>
+        public static void UpdateLocalAlias(this PropertyGroup propertyGroup, string localAlias)
+        {
+            var parentAlias = propertyGroup.GetParentAlias();
+            if (string.IsNullOrEmpty(parentAlias))
+            {
+                propertyGroup.Alias = localAlias;
+            }
+            else
+            {
+                propertyGroup.Alias = parentAlias + AliasSeparator + localAlias;
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent alias.
+        /// </summary>
+        /// <param name="propertyGroup">The property group.</param>
+        /// <returns>
+        /// The parent alias.
+        /// </returns>
+        public static string GetParentAlias(this PropertyGroup propertyGroup) => GetParentAlias(propertyGroup.Alias);
+
+        /// <summary>
+        /// Updates the parent alias.
+        /// </summary>
+        /// <param name="propertyGroup">The property group.</param>
+        /// <param name="parentAlias">The parent alias.</param>
+        public static void UpdateParentAlias(this PropertyGroup propertyGroup, string parentAlias)
+        {
+            var localAlias = propertyGroup.GetLocalAlias();
+            if (string.IsNullOrEmpty(parentAlias))
+            {
+                propertyGroup.Alias = localAlias;
+            }
+            else
+            {
+                propertyGroup.Alias = parentAlias + AliasSeparator + localAlias;
+            }
+        }
+    }
+}