Revert #16058 for non-applicable settings (#19229)

This commit is contained in:
Kenn Jacobsen
2025-05-05 15:06:18 +02:00
committed by GitHub
parent a0873f0860
commit 6518a261f0
3 changed files with 12 additions and 13 deletions

View File

@@ -144,7 +144,7 @@ public class DeliveryApiSettings
/// <value>
/// The URLs allowed as redirect targets.
/// </value>
public ISet<Uri> LoginRedirectUrls { get; set; } = new HashSet<Uri>();
public IEnumerable<Uri> LoginRedirectUrls { get; set; } = [];
/// <summary>
/// Gets or sets the URLs allowed to use as redirect targets after a successful logout (session termination).
@@ -155,7 +155,7 @@ public class DeliveryApiSettings
/// <remarks>
/// These are only required if logout is to be used.
/// </remarks>
public ISet<Uri> LogoutRedirectUrls { get; set; } = new HashSet<Uri>();
public IEnumerable<Uri> LogoutRedirectUrls { get; set; } = [];
}
/// <summary>

View File

@@ -98,5 +98,5 @@ public class RequestHandlerSettings
/// <summary>
/// Add additional character replacements, or override defaults
/// </summary>
public ISet<CharItem> UserDefinedCharCollection { get; set; } = new HashSet<CharItem>();
public IEnumerable<CharItem> UserDefinedCharCollection { get; set; } = [];
}

View File

@@ -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();