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

Minor performance improvement for UriBuildingContext.ToPathString() with zero-length path. (#880)

This commit is contained in:
Gert Driesen 2018-10-22 23:20:52 +02:00 committed by James Newton-King
parent c93e3a76ff
commit bcbf2a1a68
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs
View File

@ -242,18 +242,29 @@ namespace Microsoft.AspNetCore.Routing.Internal
// Used by TemplateBinder.TryBindValues - the new code path of LinkGenerator // Used by TemplateBinder.TryBindValues - the new code path of LinkGenerator
public PathString ToPathString() public PathString ToPathString()
{ {
if (_path.Length > 0 && _path[0] != '/') PathString pathString;
if (_path.Length > 0)
{ {
// Normalize generated paths so that they always contain a leading slash. if (_path[0] != '/')
_path.Insert(0, '/'); {
// Normalize generated paths so that they always contain a leading slash.
_path.Insert(0, '/');
}
if (AppendTrailingSlash && _path[_path.Length - 1] != '/')
{
_path.Append('/');
}
pathString = new PathString(_path.ToString());
}
else
{
pathString = PathString.Empty;
} }
if (AppendTrailingSlash && _path.Length > 0 && _path[_path.Length - 1] != '/') return pathString;
{
_path.Append('/');
}
return new PathString(_path.ToString());
} }
// Used by TemplateBinder.TryBindValues - the new code path of LinkGenerator // Used by TemplateBinder.TryBindValues - the new code path of LinkGenerator

31
test/Microsoft.AspNetCore.Routing.Tests/Internal/UriBuildingContextTest.cs
View File

@ -65,5 +65,36 @@ namespace Microsoft.AspNetCore.Routing.Internal
// Assert // Assert
Assert.Equal(expected, uriBuilldingContext.ToString()); Assert.Equal(expected, uriBuilldingContext.ToString());
} }
[Theory]
[InlineData("/Author", false, false, "/UrlEncode[[Author]]")]
[InlineData("/Author", false, true, "/UrlEncode[[Author]]")]
[InlineData("/Author", true, false, "/UrlEncode[[Author]]/")]
[InlineData("/Author", true, true, "/UrlEncode[[Author]]/")]
[InlineData("/Author/", false, false, "/UrlEncode[[Author]]/")]
[InlineData("/Author/", false, true, "/UrlEncode[[Author/]]")]
[InlineData("/Author/", true, false, "/UrlEncode[[Author]]/")]
[InlineData("/Author/", true, true, "/UrlEncode[[Author/]]/")]
[InlineData("Author", false, false, "/UrlEncode[[Author]]")]
[InlineData("Author", false, true, "/UrlEncode[[Author]]")]
[InlineData("Author", true, false, "/UrlEncode[[Author]]/")]
[InlineData("Author", true, true, "/UrlEncode[[Author]]/")]
[InlineData("", false, false, "")]
[InlineData("", false, true, "")]
[InlineData("", true, false, "")]
[InlineData("", true, true, "")]
public void ToPathString(string url, bool appendTrailingSlash, bool encodeSlashes, string expected)
{
// Arrange
var urlTestEncoder = new UrlTestEncoder();
var uriBuilldingContext = new UriBuildingContext(urlTestEncoder);
uriBuilldingContext.AppendTrailingSlash = appendTrailingSlash;
// Act
uriBuilldingContext.Accept(url, encodeSlashes);
// Assert
Assert.Equal(expected, uriBuilldingContext.ToPathString().Value);
}
} }
} }