Skip to content

Commit 8a8b1e3

Browse files
Rename CharacterReplacement back to CharItem
Since the class is public renaming this would be a breaking change, since if anyone is directly referring to the class it would break
1 parent c4f8944 commit 8a8b1e3

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

src/Umbraco.Core/Configuration/UmbracoSettings/CharacterReplacement.cs renamed to src/Umbraco.Core/Configuration/Models/CharItem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
namespace Umbraco.Cms.Core.Configuration.UmbracoSettings
1+
namespace Umbraco.Cms.Core.Configuration.Models
22
{
3-
public class CharacterReplacement
3+
public class CharItem
44
{
55
/// <summary>
66
/// The character to replace

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class RequestHandlerSettings
1919
internal const string StaticConvertUrlsToAscii = "try";
2020
internal const bool StaticEnableDefaultCharReplacements = true;
2121

22-
internal static readonly CharacterReplacement[] DefaultCharCollection =
22+
internal static readonly CharItem[] DefaultCharCollection =
2323
{
2424
new () { Char = " ", Replacement = "-" },
2525
new () { Char = "\"", Replacement = string.Empty },
@@ -78,13 +78,13 @@ public class RequestHandlerSettings
7878
/// <summary>
7979
/// Add additional character replacements, or override defaults
8080
/// </summary>
81-
public CharacterReplacement[] CharCollection { get; set; }
81+
public CharItem[] CharCollection { get; set; }
8282

8383
/// <summary>
8484
/// Get concatenated user and default character replacements
8585
/// taking into account <see cref="EnableDefaultCharReplacements"/>
8686
/// </summary>
87-
public IEnumerable<CharacterReplacement> GetCharReplacements()
87+
public IEnumerable<CharItem> GetCharReplacements()
8888
{
8989
// TODO We need to special handle ":", as this character is special in keys
9090

src/Umbraco.Core/Configuration/UmbracoSettings/CharacterReplacementEqualityComparer.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using System.Collections.Generic;
2+
using Umbraco.Cms.Core.Configuration.Models;
23

34
namespace Umbraco.Cms.Core.Configuration.UmbracoSettings
45
{
5-
public class CharacterReplacementEqualityComparer : IEqualityComparer<CharacterReplacement>
6+
public class CharacterReplacementEqualityComparer : IEqualityComparer<CharItem>
67
{
7-
public bool Equals(CharacterReplacement x, CharacterReplacement y)
8+
public bool Equals(CharItem x, CharItem y)
89
{
910
if (ReferenceEquals(x, y))
1011
{
@@ -29,7 +30,7 @@ public bool Equals(CharacterReplacement x, CharacterReplacement y)
2930
return x.Char == y.Char && x.Replacement == y.Replacement;
3031
}
3132

32-
public int GetHashCode(CharacterReplacement obj)
33+
public int GetHashCode(CharItem obj)
3334
{
3435
unchecked
3536
{

tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void U4_4056()
2020
{
2121
var requestHandlerSettings = new RequestHandlerSettings()
2222
{
23-
CharCollection = Array.Empty<CharacterReplacement>(),
23+
CharCollection = Array.Empty<CharItem>(),
2424
EnableDefaultCharReplacements = false,
2525
ConvertUrlsToAscii = "false"
2626
};
@@ -47,7 +47,7 @@ public void U4_4056_TryAscii()
4747
{
4848
var requestHandlerSettings = new RequestHandlerSettings()
4949
{
50-
CharCollection = Array.Empty<CharacterReplacement>(),
50+
CharCollection = Array.Empty<CharItem>(),
5151
EnableDefaultCharReplacements = false,
5252
ConvertUrlsToAscii = "false"
5353
};
@@ -342,7 +342,7 @@ public void CleanStringDefaultConfig()
342342
{
343343
var requestHandlerSettings = new RequestHandlerSettings()
344344
{
345-
CharCollection = Array.Empty<CharacterReplacement>(),
345+
CharCollection = Array.Empty<CharItem>(),
346346
EnableDefaultCharReplacements = false,
347347
ConvertUrlsToAscii = "false"
348348
};

0 commit comments

Comments
 (0)