diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs b/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs index 3fc763d92f..e16f06b231 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs @@ -1,4 +1,4 @@ -using Umbraco.Cms.Core.Models; +using Umbraco.Cms.Core.Models; namespace Umbraco.Cms.Core.Logging.Viewer; @@ -9,17 +9,17 @@ public interface ILogViewer /// /// Get all saved searches from your chosen data source /// - IReadOnlyList? GetSavedSearches(); + IReadOnlyList GetSavedSearches(); /// /// Adds a new saved search to chosen data source and returns the updated searches /// - IReadOnlyList? AddSavedSearch(string? name, string? query); + IReadOnlyList AddSavedSearch(string? name, string? query); /// /// Deletes a saved search to chosen data source and returns the remaining searches /// - IReadOnlyList? DeleteSavedSearch(string? name, string? query); + IReadOnlyList DeleteSavedSearch(string? name, string? query); /// /// A count of number of errors diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs b/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs index bdcbf64a94..a6b98291c9 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs @@ -2,9 +2,9 @@ namespace Umbraco.Cms.Core.Logging.Viewer; public interface ILogViewerConfig { - IReadOnlyList? GetSavedSearches(); + IReadOnlyList GetSavedSearches(); - IReadOnlyList? AddSavedSearch(string? name, string? query); + IReadOnlyList AddSavedSearch(string? name, string? query); - IReadOnlyList? DeleteSavedSearch(string? name, string? query); + IReadOnlyList DeleteSavedSearch(string? name, string? query); } diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs index e8b9de36d7..15f7f8996c 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs @@ -1,4 +1,4 @@ -using Umbraco.Cms.Core.Models; +using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Scoping; using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope; @@ -16,15 +16,15 @@ public class LogViewerConfig : ILogViewerConfig _scopeProvider = scopeProvider; } - public IReadOnlyList? GetSavedSearches() + public IReadOnlyList GetSavedSearches() { using IScope scope = _scopeProvider.CreateScope(autoComplete: true); - IEnumerable? logViewerQueries = _logViewerQueryRepository.GetMany(); - SavedLogSearch[]? result = logViewerQueries?.Select(x => new SavedLogSearch() { Name = x.Name, Query = x.Query }).ToArray(); + IEnumerable logViewerQueries = _logViewerQueryRepository.GetMany(); + SavedLogSearch[] result = logViewerQueries.Select(x => new SavedLogSearch() { Name = x.Name, Query = x.Query }).ToArray(); return result; } - public IReadOnlyList? AddSavedSearch(string? name, string? query) + public IReadOnlyList AddSavedSearch(string? name, string? query) { using IScope scope = _scopeProvider.CreateScope(autoComplete: true); _logViewerQueryRepository.Save(new LogViewerQuery(name, query)); @@ -32,7 +32,7 @@ public class LogViewerConfig : ILogViewerConfig return GetSavedSearches(); } - public IReadOnlyList? DeleteSavedSearch(string? name, string? query) + public IReadOnlyList DeleteSavedSearch(string? name, string? query) { using IScope scope = _scopeProvider.CreateScope(autoComplete: true); ILogViewerQuery? item = name is null ? null : _logViewerQueryRepository.GetByName(name); diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs index 4b41df90f7..c41d384640 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs @@ -1,8 +1,6 @@ -using System.Collections.ObjectModel; -using Microsoft.Extensions.DependencyInjection; +using System.Collections.ObjectModel; using Serilog; using Serilog.Events; -using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Extensions; @@ -12,26 +10,24 @@ public abstract class SerilogLogViewerSourceBase : ILogViewer { private readonly ILogLevelLoader _logLevelLoader; private readonly ILogViewerConfig _logViewerConfig; - private readonly ILogger _serilogLog; protected SerilogLogViewerSourceBase(ILogViewerConfig logViewerConfig, ILogLevelLoader logLevelLoader, ILogger serilogLog) { _logViewerConfig = logViewerConfig; _logLevelLoader = logLevelLoader; - _serilogLog = serilogLog; } public abstract bool CanHandleLargeLogs { get; } public abstract bool CheckCanOpenLogs(LogTimePeriod logTimePeriod); - public virtual IReadOnlyList? GetSavedSearches() + public virtual IReadOnlyList GetSavedSearches() => _logViewerConfig.GetSavedSearches(); - public virtual IReadOnlyList? AddSavedSearch(string? name, string? query) + public virtual IReadOnlyList AddSavedSearch(string? name, string? query) => _logViewerConfig.AddSavedSearch(name, query); - public virtual IReadOnlyList? DeleteSavedSearch(string? name, string? query) + public virtual IReadOnlyList DeleteSavedSearch(string? name, string? query) => _logViewerConfig.DeleteSavedSearch(name, query); public int GetNumberOfErrors(LogTimePeriod logTimePeriod) diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs index 57ffac3f2f..ed3994e6df 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs @@ -129,14 +129,14 @@ public class LogViewerController : BackOfficeNotificationsController } [HttpGet] - public IEnumerable? GetSavedSearches() => _logViewer.GetSavedSearches(); + public IEnumerable GetSavedSearches() => _logViewer.GetSavedSearches(); [HttpPost] - public IEnumerable? PostSavedSearch(SavedLogSearch item) => + public IEnumerable PostSavedSearch(SavedLogSearch item) => _logViewer.AddSavedSearch(item.Name, item.Query); [HttpPost] - public IEnumerable? DeleteSavedSearch(SavedLogSearch item) => + public IEnumerable DeleteSavedSearch(SavedLogSearch item) => _logViewer.DeleteSavedSearch(item.Name, item.Query); [HttpGet]