From 4a5eca3c6a8a779cb0262dc6a05bfb8ea24880fe Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 28 Jan 2019 15:39:49 +0000
Subject: [PATCH] Adds in Composition Extension Methods to allow Setting the
 LogViewer without having to know the composition.RegisterUnique syntax

---
 .../Components/CompositionExtensions.cs       | 32 +++++++++++++++++++
 .../Logging/Viewer/LogViewerComposer.cs       |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs
index 2aef865994..4e3e4816e5 100644
--- a/src/Umbraco.Core/Components/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Components/CompositionExtensions.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
 using Umbraco.Core._Legacy.PackageActions;
+using Umbraco.Core.Logging.Viewer;
 
 namespace Umbraco.Core.Components
 {
@@ -297,6 +298,37 @@ namespace Umbraco.Core.Components
         public static void SetMediaFileSystem(this Composition composition, Func<IFileSystem> filesystemFactory)
             => composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(_ => filesystemFactory());
 
+        /// <summary>
+        /// Sets the log viewer.
+        /// </summary>
+        /// <typeparam name="T">The type of the log viewer.</typeparam>
+        /// <param name="composition">The composition.</param>
+        public static void SetLogViewer<T>(this Composition composition)
+            where T : ILogViewer
+        {
+            composition.RegisterUnique<ILogViewer, T>();
+        }
+
+        /// <summary>
+        /// Sets the log viewer.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="factory">A function creating a log viewer.</param>
+        public static void SetLogViewer(this Composition composition, Func<IFactory, ILogViewer> factory)
+        {
+            composition.RegisterUnique(factory);
+        }
+
+        /// <summary>
+        /// Sets the log viewer.
+        /// </summary>
+        /// <param name="composition">A composition.</param>
+        /// <param name="helper">A log viewer.</param>
+        public static void SetLogViewer(this Composition composition, ILogViewer viewer)
+        {
+            composition.RegisterUnique(_ => viewer);
+        }
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs b/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs
index f3d1b5137f..5ddcb01078 100644
--- a/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs
+++ b/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Logging.Viewer
     {
         public void Compose(Composition composition)
         {
-            composition.RegisterUnique<ILogViewer>(_ => new JsonLogViewer());
+            composition.SetLogViewer(_ => new JsonLogViewer());
         }
     }
 }