huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use preferred overloads of string.Split() (#23712) 

* Use preferred overloads of string.Split

* Revert TrimEntries for netstandard2.0

Revert usage of StringSplit.TrimEntries for projects that target netstandard2.0.

Co-authored-by: Levi Broderick <levib@microsoft.com>
This commit is contained in:
Martin Costello 2020-07-07 00:49:38 +01:00 committed by GitHub
parent a738d1ccfb
commit fd1f1c3559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Hosting/Hosting/src/Internal/WebHostOptions.cs
View File

@ -76,21 +76,8 @@ namespace Microsoft.AspNetCore.Hosting
private IReadOnlyList<string> Split(string value) private IReadOnlyList<string> Split(string value)
{ {
if (string.IsNullOrWhiteSpace(value)) return value?.Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
{ ?? Array.Empty<string>();
return Array.Empty<string>();
}
var list = new List<string>();
foreach (var part in value.Split(';', StringSplitOptions.RemoveEmptyEntries))
{
var trimmedPart = part;
if (!string.IsNullOrEmpty(trimmedPart))
{
list.Add(trimmedPart);
}
}
return list;
} }
} }
} }

4
src/Http/Routing/src/ParameterPolicyActivator.cs
View File

@ -100,9 +100,7 @@ namespace Microsoft.AspNetCore.Routing
} }
else else
{ {
var arguments = !string.IsNullOrEmpty(argumentString) var arguments = argumentString?.Split(',', StringSplitOptions.TrimEntries) ?? Array.Empty<string>();
? argumentString.Split(',').Select(argument => argument.Trim()).ToArray()
: Array.Empty<string>();
// We want to find the constructors that match the number of passed in arguments // We want to find the constructors that match the number of passed in arguments
// We either want a single match, or a single best match. The best match is the one with the most // We either want a single match, or a single best match. The best match is the one with the most

11
src/Mvc/Mvc.Core/src/BindAttribute.cs
View File

@ -71,15 +71,6 @@ namespace Microsoft.AspNetCore.Mvc
} }
private static IEnumerable<string> SplitString(string original) private static IEnumerable<string> SplitString(string original)
{ => original?.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
if (string.IsNullOrEmpty(original))
{
return Array.Empty<string>();
}
var split = original.Split(',').Select(piece => piece.Trim()).Where(piece => !string.IsNullOrEmpty(piece));
return split;
}
} }
} }

14
src/Mvc/Mvc.ViewFeatures/src/RemoteAttributeBase.cs
View File

@ -173,19 +173,7 @@ namespace Microsoft.AspNetCore.Mvc
} }
private static IEnumerable<string> SplitAndTrimPropertyNames(string original) private static IEnumerable<string> SplitAndTrimPropertyNames(string original)
{ => original?.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
if (string.IsNullOrEmpty(original))
{
return Array.Empty<string>();
}
var split = original
.Split(',')
.Select(piece => piece.Trim())
.Where(trimmed => !string.IsNullOrEmpty(trimmed));
return split;
}
private void CheckForLocalizer(ClientModelValidationContext context) private void CheckForLocalizer(ClientModelValidationContext context)
{ {