From 12f7492d80ce96312e7243b963ba3a8203c09b2a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 20 Feb 2019 16:27:52 +0100
Subject: [PATCH] Reorg code

---
 ..._Accessors.cs => CompositionExtensions.cs} | 40 ----------------
 .../CompositionExtensions_Essentials.cs       | 33 -------------
 .../CompositionExtensions_FileSystems.cs      | 47 +++++++++++++++++++
 .../CompositionExtensions_Uniques.cs          | 35 ++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  4 +-
 5 files changed, 85 insertions(+), 74 deletions(-)
 rename src/Umbraco.Core/{CompositionExtensions_Accessors.cs => CompositionExtensions.cs} (87%)
 create mode 100644 src/Umbraco.Core/CompositionExtensions_FileSystems.cs
 create mode 100644 src/Umbraco.Core/CompositionExtensions_Uniques.cs

diff --git a/src/Umbraco.Core/CompositionExtensions_Accessors.cs b/src/Umbraco.Core/CompositionExtensions.cs
similarity index 87%
rename from src/Umbraco.Core/CompositionExtensions_Accessors.cs
rename to src/Umbraco.Core/CompositionExtensions.cs
index f19437809e..e1c7ad4467 100644
--- a/src/Umbraco.Core/CompositionExtensions_Accessors.cs
+++ b/src/Umbraco.Core/CompositionExtensions.cs
@@ -18,46 +18,6 @@ namespace Umbraco.Core
     /// </summary>
     public static partial class CompositionExtensions
     {
-        #region FileSystems
-
-        /// <summary>
-        /// Registers a filesystem.
-        /// </summary>
-        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
-        /// <typeparam name="TImplementing">The implementing type.</typeparam>
-        /// <param name="composition">The composition.</param>
-        /// <returns>The register.</returns>
-        public static void RegisterFileSystem<TFileSystem, TImplementing>(this Composition composition)
-            where TImplementing : FileSystemWrapper, TFileSystem
-            where TFileSystem : class
-        {
-            composition.RegisterUnique<TFileSystem>(factory =>
-            {
-                var fileSystems = factory.GetInstance<FileSystems>();
-                var supporting = factory.GetInstance<SupportingFileSystems>();
-                return fileSystems.GetFileSystem<TImplementing>(supporting.For<TFileSystem>());
-            });
-        }
-
-        /// <summary>
-        /// Registers a filesystem.
-        /// </summary>
-        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
-        /// <param name="composition">The composition.</param>
-        /// <returns>The register.</returns>
-        public static void RegisterFileSystem<TFileSystem>(this Composition composition)
-            where TFileSystem : FileSystemWrapper
-        {
-            composition.RegisterUnique(factory =>
-            {
-                var fileSystems = factory.GetInstance<FileSystems>();
-                var supporting = factory.GetInstance<SupportingFileSystems>();
-                return fileSystems.GetFileSystem<TFileSystem>(supporting.For<TFileSystem>());
-            });
-        }
-
-        #endregion
-
         #region Collection Builders
 
         /// <summary>
diff --git a/src/Umbraco.Core/CompositionExtensions_Essentials.cs b/src/Umbraco.Core/CompositionExtensions_Essentials.cs
index 46575c1428..b85479716c 100644
--- a/src/Umbraco.Core/CompositionExtensions_Essentials.cs
+++ b/src/Umbraco.Core/CompositionExtensions_Essentials.cs
@@ -10,8 +10,6 @@ namespace Umbraco.Core
     /// </summary>
     public static partial class CompositionExtensions
     {
-        #region Essentials
-
         /// <summary>
         /// Registers essential services.
         /// </summary>
@@ -33,36 +31,5 @@ namespace Umbraco.Core
             composition.RegisterUnique(typeLoader);
             composition.RegisterUnique(state);
         }
-
-        #endregion
-
-        #region Unique
-
-        /// <summary>
-        /// Registers a unique service as its own implementation.
-        /// </summary>
-        public static void RegisterUnique<TService>(this Composition composition)
-            => composition.RegisterUnique(typeof(TService), typeof(TService));
-
-        /// <summary>
-        /// Registers a unique service with an implementation type.
-        /// </summary>
-        public static void RegisterUnique<TService, TImplementing>(this Composition composition)
-            => composition.RegisterUnique(typeof(TService), typeof(TImplementing));
-
-        /// <summary>
-        /// Registers a unique service with an implementation type, for a target.
-        /// </summary>
-        public static void RegisterUniqueFor<TService, TTarget, TImplementing>(this Composition composition)
-            where TService : class
-            => composition.RegisterUniqueFor<TService, TTarget>(typeof(TImplementing));
-
-        /// <summary>
-        /// Registers a unique service with an implementing instance.
-        /// </summary>
-        public static void RegisterUnique<TService>(this Composition composition, TService instance)
-            => composition.RegisterUnique(typeof(TService), instance);
-
-        #endregion
     }
 }
diff --git a/src/Umbraco.Core/CompositionExtensions_FileSystems.cs b/src/Umbraco.Core/CompositionExtensions_FileSystems.cs
new file mode 100644
index 0000000000..f6c65e1e1f
--- /dev/null
+++ b/src/Umbraco.Core/CompositionExtensions_FileSystems.cs
@@ -0,0 +1,47 @@
+using Umbraco.Core.Composing;
+using Umbraco.Core.IO;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides extension methods to the <see cref="Composition"/> class.
+    /// </summary>
+    public static partial class CompositionExtensions
+    {
+        /// <summary>
+        /// Registers a filesystem.
+        /// </summary>
+        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
+        /// <typeparam name="TImplementing">The implementing type.</typeparam>
+        /// <param name="composition">The composition.</param>
+        /// <returns>The register.</returns>
+        public static void RegisterFileSystem<TFileSystem, TImplementing>(this Composition composition)
+            where TImplementing : FileSystemWrapper, TFileSystem
+            where TFileSystem : class
+        {
+            composition.RegisterUnique<TFileSystem>(factory =>
+            {
+                var fileSystems = factory.GetInstance<FileSystems>();
+                var supporting = factory.GetInstance<SupportingFileSystems>();
+                return fileSystems.GetFileSystem<TImplementing>(supporting.For<TFileSystem>());
+            });
+        }
+
+        /// <summary>
+        /// Registers a filesystem.
+        /// </summary>
+        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
+        /// <param name="composition">The composition.</param>
+        /// <returns>The register.</returns>
+        public static void RegisterFileSystem<TFileSystem>(this Composition composition)
+            where TFileSystem : FileSystemWrapper
+        {
+            composition.RegisterUnique(factory =>
+            {
+                var fileSystems = factory.GetInstance<FileSystems>();
+                var supporting = factory.GetInstance<SupportingFileSystems>();
+                return fileSystems.GetFileSystem<TFileSystem>(supporting.For<TFileSystem>());
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/CompositionExtensions_Uniques.cs b/src/Umbraco.Core/CompositionExtensions_Uniques.cs
new file mode 100644
index 0000000000..52f1ce7ecd
--- /dev/null
+++ b/src/Umbraco.Core/CompositionExtensions_Uniques.cs
@@ -0,0 +1,35 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides extension methods to the <see cref="Composition"/> class.
+    /// </summary>
+    public static partial class CompositionExtensions
+    {
+        /// <summary>
+        /// Registers a unique service as its own implementation.
+        /// </summary>
+        public static void RegisterUnique<TService>(this Composition composition)
+            => composition.RegisterUnique(typeof(TService), typeof(TService));
+
+        /// <summary>
+        /// Registers a unique service with an implementation type.
+        /// </summary>
+        public static void RegisterUnique<TService, TImplementing>(this Composition composition)
+            => composition.RegisterUnique(typeof(TService), typeof(TImplementing));
+
+        /// <summary>
+        /// Registers a unique service with an implementation type, for a target.
+        /// </summary>
+        public static void RegisterUniqueFor<TService, TTarget, TImplementing>(this Composition composition)
+            where TService : class
+            => composition.RegisterUniqueFor<TService, TTarget>(typeof(TImplementing));
+
+        /// <summary>
+        /// Registers a unique service with an implementing instance.
+        /// </summary>
+        public static void RegisterUnique<TService>(this Composition composition, TService instance)
+            => composition.RegisterUnique(typeof(TService), instance);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index c3fe7be10a..c7e7db18a7 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -161,7 +161,7 @@
     <Compile Include="Composing\ComponentComposer.cs" />
     <Compile Include="Composing\Composers.cs" />
     <Compile Include="Composing\Composition.cs" />
-    <Compile Include="CompositionExtensions_Accessors.cs" />
+    <Compile Include="CompositionExtensions.cs" />
     <Compile Include="Composing\DisableAttribute.cs" />
     <Compile Include="Composing\DisableComposerAttribute.cs" />
     <Compile Include="Composing\EnableAttribute.cs" />
@@ -187,6 +187,8 @@
     <Compile Include="Composing\CompositionExtensions\Repositories.cs" />
     <Compile Include="Composing\CompositionExtensions\Services.cs" />
     <Compile Include="CompositionExtensions_Essentials.cs" />
+    <Compile Include="CompositionExtensions_FileSystems.cs" />
+    <Compile Include="CompositionExtensions_Uniques.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />