From e6ad34da1d1aa5a1f9d8cfb863e5ab12f866f475 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 14 Sep 2020 09:13:53 +0200 Subject: [PATCH] More clean up of old configs --- .../Legacy/LoggingSettings.cs | 9 --------- .../Models/LoggingSettings.cs | 19 ------------------- .../UmbracoSettings/LoggingElement.cs | 14 -------------- .../UmbracoSettings/UmbracoSettingsSection.cs | 3 --- .../UmbracoSettings/ILoggingSettings.cs | 9 --------- .../LoggingElementDefaultTests.cs | 16 ---------------- .../UmbracoSettings/LoggingElementTests.cs | 17 ----------------- .../UmbracoSettings/UmbracoSettingsTests.cs | 1 - 8 files changed, 88 deletions(-) delete mode 100644 src/Umbraco.Configuration/Legacy/LoggingSettings.cs delete mode 100644 src/Umbraco.Configuration/Models/LoggingSettings.cs delete mode 100644 src/Umbraco.Configuration/UmbracoSettings/LoggingElement.cs delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSettings.cs delete mode 100644 src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/LoggingElementDefaultTests.cs delete mode 100644 src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/LoggingElementTests.cs diff --git a/src/Umbraco.Configuration/Legacy/LoggingSettings.cs b/src/Umbraco.Configuration/Legacy/LoggingSettings.cs deleted file mode 100644 index 020b0c0e64..0000000000 --- a/src/Umbraco.Configuration/Legacy/LoggingSettings.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Umbraco.Core.Configuration.UmbracoSettings; - -namespace Umbraco.Configuration.Implementations -{ - internal class LoggingSettings : ConfigurationManagerConfigBase, ILoggingSettings - { - public int MaxLogAge => UmbracoSettingsSection.Logging.MaxLogAge; - } -} diff --git a/src/Umbraco.Configuration/Models/LoggingSettings.cs b/src/Umbraco.Configuration/Models/LoggingSettings.cs deleted file mode 100644 index b05fe03875..0000000000 --- a/src/Umbraco.Configuration/Models/LoggingSettings.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Umbraco.Core; -using Umbraco.Core.Configuration.UmbracoSettings; - -namespace Umbraco.Configuration.Models -{ - internal class LoggingSettings : ILoggingSettings - { - private const string Prefix = Constants.Configuration.ConfigPrefix + "Logging:"; - private readonly IConfiguration _configuration; - - public LoggingSettings(IConfiguration configuration) - { - _configuration = configuration; - } - - public int MaxLogAge => _configuration.GetValue(Prefix + "MaxLogAge", -1); - } -} diff --git a/src/Umbraco.Configuration/UmbracoSettings/LoggingElement.cs b/src/Umbraco.Configuration/UmbracoSettings/LoggingElement.cs deleted file mode 100644 index 2fdd61e169..0000000000 --- a/src/Umbraco.Configuration/UmbracoSettings/LoggingElement.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class LoggingElement : UmbracoConfigurationElement, ILoggingSettings - { - - [ConfigurationProperty("maxLogAge")] - internal InnerTextConfigurationElement MaxLogAge => GetOptionalTextElement("maxLogAge", -1); - - int ILoggingSettings.MaxLogAge => MaxLogAge; - } -} diff --git a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs index 944f18c3f1..34e3c9c242 100644 --- a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs +++ b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs @@ -14,9 +14,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings [ConfigurationProperty("requestHandler")] public RequestHandlerElement RequestHandler => (RequestHandlerElement)this["requestHandler"]; - [ConfigurationProperty("logging")] - public LoggingElement Logging => (LoggingElement)this["logging"]; - [ConfigurationProperty("web.routing")] public WebRoutingElement WebRouting => (WebRoutingElement)this["web.routing"]; diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSettings.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSettings.cs deleted file mode 100644 index ee5647ee27..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSettings.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - public interface ILoggingSettings : IUmbracoConfigurationSection - { - int MaxLogAge { get; } - } -} diff --git a/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/LoggingElementDefaultTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/LoggingElementDefaultTests.cs deleted file mode 100644 index 084c649f11..0000000000 --- a/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/LoggingElementDefaultTests.cs +++ /dev/null @@ -1,16 +0,0 @@ -using NUnit.Framework; - -namespace Umbraco.Tests.Integration.Umbraco.Configuration.UmbracoSettings -{ - [TestFixture] - public class LoggingElementDefaultTests : LoggingElementTests - { - protected override bool TestingDefaults => true; - - [Test] - public override void MaxLogAge() - { - Assert.IsTrue(LoggingSettings.MaxLogAge == -1); - } - } -} diff --git a/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/LoggingElementTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/LoggingElementTests.cs deleted file mode 100644 index 3fd8041540..0000000000 --- a/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/LoggingElementTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -using NUnit.Framework; - -namespace Umbraco.Tests.Integration.Umbraco.Configuration.UmbracoSettings -{ - [TestFixture] - public class LoggingElementTests : UmbracoSettingsTests - { - - [Test] - public virtual void MaxLogAge() - { - Assert.IsTrue(LoggingSettings.MaxLogAge == 1440); - - } - - } -} diff --git a/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsTests.cs index e869a972f5..7916100396 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsTests.cs @@ -35,7 +35,6 @@ namespace Umbraco.Tests.Integration.Umbraco.Configuration.UmbracoSettings } private UmbracoSettingsSection Settings { get; set; } - protected ILoggingSettings LoggingSettings => Settings.Logging; protected IWebRoutingSettings WebRoutingSettings => Settings.WebRouting; protected IRequestHandlerSettings RequestHandlerSettings => Settings.RequestHandler; protected ISecuritySettings SecuritySettings => Settings.Security;