diff --git a/src/Umbraco.Core/Configuration/Models/DeliveryApiSettings.cs b/src/Umbraco.Core/Configuration/Models/DeliveryApiSettings.cs
index b1944dad5f..797a055912 100644
--- a/src/Umbraco.Core/Configuration/Models/DeliveryApiSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/DeliveryApiSettings.cs
@@ -144,7 +144,7 @@ public class DeliveryApiSettings
///
/// The URLs allowed as redirect targets.
///
- public ISet LoginRedirectUrls { get; set; } = new HashSet();
+ public IEnumerable LoginRedirectUrls { get; set; } = [];
///
/// Gets or sets the URLs allowed to use as redirect targets after a successful logout (session termination).
@@ -155,7 +155,7 @@ public class DeliveryApiSettings
///
/// These are only required if logout is to be used.
///
- public ISet LogoutRedirectUrls { get; set; } = new HashSet();
+ public IEnumerable LogoutRedirectUrls { get; set; } = [];
}
///
diff --git a/src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs b/src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs
index d4e7f66c81..0383f1a87c 100644
--- a/src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs
@@ -98,5 +98,5 @@ public class RequestHandlerSettings
///
/// Add additional character replacements, or override defaults
///
- public ISet UserDefinedCharCollection { get; set; } = new HashSet();
+ public IEnumerable UserDefinedCharCollection { get; set; } = [];
}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs
index 0bf9ed2971..44b953500a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs
@@ -1,4 +1,3 @@
-using System.Linq;
using NUnit.Framework;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Extensions;
@@ -14,10 +13,10 @@ public class RequestHandlerSettingsTests
var settings = new RequestHandlerSettings
{
UserDefinedCharCollection =
- {
+ [
new() { Char = "test", Replacement = "replace" },
new() { Char = "test2", Replacement = "replace2" },
- }
+ ]
};
var actual = settings.GetCharReplacements().ToList();
@@ -34,15 +33,15 @@ public class RequestHandlerSettingsTests
var settings = new RequestHandlerSettings
{
UserDefinedCharCollection =
- {
+ [
new() { Char = "test", Replacement = "replace" },
new() { Char = "test2", Replacement = "replace2" },
- },
+ ],
EnableDefaultCharReplacements = false,
};
var actual = settings.GetCharReplacements().ToList();
- Assert.AreEqual(settings.UserDefinedCharCollection.Count, actual.Count);
+ Assert.AreEqual(settings.UserDefinedCharCollection.Count(), actual.Count);
Assert.That(actual, Is.EquivalentTo(settings.UserDefinedCharCollection));
}
@@ -52,10 +51,10 @@ public class RequestHandlerSettingsTests
var settings = new RequestHandlerSettings
{
UserDefinedCharCollection =
- {
+ [
new() { Char = "%", Replacement = "percent" },
new() { Char = ".", Replacement = "dot" },
- }
+ ]
};
var actual = settings.GetCharReplacements().ToList();
@@ -73,11 +72,11 @@ public class RequestHandlerSettingsTests
var settings = new RequestHandlerSettings
{
UserDefinedCharCollection =
- {
+ [
new() { Char = "%", Replacement = "percent" },
new() { Char = ".", Replacement = "dot" },
new() { Char = "new", Replacement = "new" },
- }
+ ]
};
var actual = settings.GetCharReplacements().ToList();