Skip to content

Commit 6518a26

Browse files
authored
Revert #16058 for non-applicable settings (#19229)
1 parent a0873f0 commit 6518a26

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

src/Umbraco.Core/Configuration/Models/DeliveryApiSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public class AuthorizationCodeFlowSettings
144144
/// <value>
145145
/// The URLs allowed as redirect targets.
146146
/// </value>
147-
public ISet<Uri> LoginRedirectUrls { get; set; } = new HashSet<Uri>();
147+
public IEnumerable<Uri> LoginRedirectUrls { get; set; } = [];
148148

149149
/// <summary>
150150
/// Gets or sets the URLs allowed to use as redirect targets after a successful logout (session termination).
@@ -155,7 +155,7 @@ public class AuthorizationCodeFlowSettings
155155
/// <remarks>
156156
/// These are only required if logout is to be used.
157157
/// </remarks>
158-
public ISet<Uri> LogoutRedirectUrls { get; set; } = new HashSet<Uri>();
158+
public IEnumerable<Uri> LogoutRedirectUrls { get; set; } = [];
159159
}
160160

161161
/// <summary>

src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ public class RequestHandlerSettings
9898
/// <summary>
9999
/// Add additional character replacements, or override defaults
100100
/// </summary>
101-
public ISet<CharItem> UserDefinedCharCollection { get; set; } = new HashSet<CharItem>();
101+
public IEnumerable<CharItem> UserDefinedCharCollection { get; set; } = [];
102102
}

tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System.Linq;
21
using NUnit.Framework;
32
using Umbraco.Cms.Core.Configuration.Models;
43
using Umbraco.Extensions;
@@ -14,10 +13,10 @@ public void Given_CharCollection_With_DefaultEnabled_MergesCollection()
1413
var settings = new RequestHandlerSettings
1514
{
1615
UserDefinedCharCollection =
17-
{
16+
[
1817
new() { Char = "test", Replacement = "replace" },
1918
new() { Char = "test2", Replacement = "replace2" },
20-
}
19+
]
2120
};
2221
var actual = settings.GetCharReplacements().ToList();
2322

@@ -34,15 +33,15 @@ public void Given_CharCollection_With_DefaultDisabled_ReturnsUserCollection()
3433
var settings = new RequestHandlerSettings
3534
{
3635
UserDefinedCharCollection =
37-
{
36+
[
3837
new() { Char = "test", Replacement = "replace" },
3938
new() { Char = "test2", Replacement = "replace2" },
40-
},
39+
],
4140
EnableDefaultCharReplacements = false,
4241
};
4342
var actual = settings.GetCharReplacements().ToList();
4443

45-
Assert.AreEqual(settings.UserDefinedCharCollection.Count, actual.Count);
44+
Assert.AreEqual(settings.UserDefinedCharCollection.Count(), actual.Count);
4645
Assert.That(actual, Is.EquivalentTo(settings.UserDefinedCharCollection));
4746
}
4847

@@ -52,10 +51,10 @@ public void Given_CharCollection_That_OverridesDefaultValues_ReturnsReplacements
5251
var settings = new RequestHandlerSettings
5352
{
5453
UserDefinedCharCollection =
55-
{
54+
[
5655
new() { Char = "%", Replacement = "percent" },
5756
new() { Char = ".", Replacement = "dot" },
58-
}
57+
]
5958
};
6059
var actual = settings.GetCharReplacements().ToList();
6160

@@ -73,11 +72,11 @@ public void Given_CharCollection_That_OverridesDefaultValues_And_ContainsNew_Ret
7372
var settings = new RequestHandlerSettings
7473
{
7574
UserDefinedCharCollection =
76-
{
75+
[
7776
new() { Char = "%", Replacement = "percent" },
7877
new() { Char = ".", Replacement = "dot" },
7978
new() { Char = "new", Replacement = "new" },
80-
}
79+
]
8180
};
8281
var actual = settings.GetCharReplacements().ToList();
8382

0 commit comments

Comments
 (0)