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

React to IRequestIdentifierFeature refactor.

This commit is contained in:
Chris R 2015-06-18 15:38:58 -07:00
parent 736e6bee2b
commit 2c43b350b4
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Microsoft.AspNet.Hosting/DefaultRequestIdentifierFeature.cs
View File

@ -1,18 +0,0 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Http.Features;
namespace Microsoft.AspNet.Hosting
{
public class DefaultRequestIdentifierFeature : IRequestIdentifierFeature
{
public DefaultRequestIdentifierFeature()
{
TraceIdentifier = Guid.NewGuid();
}
public Guid TraceIdentifier { get; }
}
}

10
src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
View File

@ -11,6 +11,7 @@ using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Hosting.Startup; using Microsoft.AspNet.Hosting.Startup;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.Http.Features.Internal;
using Microsoft.Framework.Configuration; using Microsoft.Framework.Configuration;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.Internal; using Microsoft.Framework.Internal;
@ -158,12 +159,15 @@ namespace Microsoft.AspNet.Hosting.Internal
return builder.Build(); return builder.Build();
} }
private Guid GetRequestIdentifier(HttpContext httpContext) private string GetRequestIdentifier(HttpContext httpContext)
{ {
var requestIdentifierFeature = httpContext.GetFeature<IRequestIdentifierFeature>(); var requestIdentifierFeature = httpContext.GetFeature<IHttpRequestIdentifierFeature>();
if (requestIdentifierFeature == null) if (requestIdentifierFeature == null)
{ {
requestIdentifierFeature = new DefaultRequestIdentifierFeature(); requestIdentifierFeature = new HttpRequestIdentifierFeature()
{
TraceIdentifier = Guid.NewGuid().ToString()
};
httpContext.SetFeature(requestIdentifierFeature); httpContext.SetFeature(requestIdentifierFeature);
} }

11
test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
View File

@ -13,6 +13,7 @@ using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Hosting.Startup; using Microsoft.AspNet.Hosting.Startup;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.Http.Features.Internal;
using Microsoft.AspNet.Testing.xunit; using Microsoft.AspNet.Testing.xunit;
using Microsoft.Framework.Configuration; using Microsoft.Framework.Configuration;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
@ -241,7 +242,7 @@ namespace Microsoft.AspNet.Hosting
// Assert // Assert
Assert.NotNull(httpContext); Assert.NotNull(httpContext);
Assert.IsType<DefaultRequestIdentifierFeature>(httpContext.GetFeature<IRequestIdentifierFeature>()); Assert.IsType<HttpRequestIdentifierFeature>(httpContext.GetFeature<IHttpRequestIdentifierFeature>());
} }
[Fact] [Fact]
@ -270,7 +271,7 @@ namespace Microsoft.AspNet.Hosting
// Assert // Assert
Assert.NotNull(httpContext); Assert.NotNull(httpContext);
Assert.IsType<DefaultRequestIdentifierFeature>(httpContext.GetFeature<IRequestIdentifierFeature>()); Assert.IsType<HttpRequestIdentifierFeature>(httpContext.GetFeature<IHttpRequestIdentifierFeature>());
} }
[Fact] [Fact]
@ -283,8 +284,8 @@ namespace Microsoft.AspNet.Hosting
httpContext = innerHttpContext; httpContext = innerHttpContext;
return Task.FromResult(0); return Task.FromResult(0);
}); });
var requestIdentifierFeature = new Mock<IRequestIdentifierFeature>().Object; var requestIdentifierFeature = new Mock<IHttpRequestIdentifierFeature>().Object;
_featuresSupportedByThisHost.Add(typeof(IRequestIdentifierFeature), requestIdentifierFeature); _featuresSupportedByThisHost.Add(typeof(IHttpRequestIdentifierFeature), requestIdentifierFeature);
var hostingEngine = CreateHostingEngine(requestDelegate); var hostingEngine = CreateHostingEngine(requestDelegate);
// Act // Act
@ -292,7 +293,7 @@ namespace Microsoft.AspNet.Hosting
// Assert // Assert
Assert.NotNull(httpContext); Assert.NotNull(httpContext);
Assert.Same(requestIdentifierFeature, httpContext.GetFeature<IRequestIdentifierFeature>()); Assert.Same(requestIdentifierFeature, httpContext.GetFeature<IHttpRequestIdentifierFeature>());
} }
[Fact] [Fact]