Change GetService calls to GetRequiredService
GetRequiredService throws for missing services like GetService used to.
This commit is contained in:
parent
30a4ee1ce1
commit
fff1d62f01
|
|
@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Routing
|
||||||
|
|
||||||
var inlineConstraintResolver = routeCollectionBuilder
|
var inlineConstraintResolver = routeCollectionBuilder
|
||||||
.ServiceProvider
|
.ServiceProvider
|
||||||
.GetService<IInlineConstraintResolver>();
|
.GetRequiredService<IInlineConstraintResolver>();
|
||||||
routeCollectionBuilder.Routes.Add(new TemplateRoute(routeCollectionBuilder.DefaultHandler,
|
routeCollectionBuilder.Routes.Add(new TemplateRoute(routeCollectionBuilder.DefaultHandler,
|
||||||
name,
|
name,
|
||||||
template,
|
template,
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,7 @@ namespace Microsoft.AspNet.Routing
|
||||||
{
|
{
|
||||||
if (_logger == null)
|
if (_logger == null)
|
||||||
{
|
{
|
||||||
var factory = context.RequestServices.GetService<ILoggerFactory>();
|
var factory = context.RequestServices.GetRequiredService<ILoggerFactory>();
|
||||||
_logger = factory.Create<RouteCollection>();
|
_logger = factory.Create<RouteCollection>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ namespace Microsoft.AspNet.Builder
|
||||||
{
|
{
|
||||||
if (_logger == null)
|
if (_logger == null)
|
||||||
{
|
{
|
||||||
var factory = context.RequestServices.GetService<ILoggerFactory>();
|
var factory = context.RequestServices.GetRequiredService<ILoggerFactory>();
|
||||||
_logger = factory.Create<RouterMiddleware>();
|
_logger = factory.Create<RouterMiddleware>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -295,7 +295,7 @@ namespace Microsoft.AspNet.Routing.Template
|
||||||
{
|
{
|
||||||
if (_logger == null)
|
if (_logger == null)
|
||||||
{
|
{
|
||||||
var factory = context.RequestServices.GetService<ILoggerFactory>();
|
var factory = context.RequestServices.GetRequiredService<ILoggerFactory>();
|
||||||
_logger = factory.Create<TemplateRoute>();
|
_logger = factory.Create<TemplateRoute>();
|
||||||
_constraintLogger = factory.Create(typeof(RouteConstraintMatcher).FullName);
|
_constraintLogger = factory.Create(typeof(RouteConstraintMatcher).FullName);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -301,7 +301,7 @@ namespace Microsoft.AspNet.Routing.Tests
|
||||||
.ConstraintMap
|
.ConstraintMap
|
||||||
.Add("test", typeof(TestRouteConstraint)));
|
.Add("test", typeof(TestRouteConstraint)));
|
||||||
var serviceProvider = services.BuildServiceProvider();
|
var serviceProvider = services.BuildServiceProvider();
|
||||||
var accessor = serviceProvider.GetService<IOptions<RouteOptions>>();
|
var accessor = serviceProvider.GetRequiredService<IOptions<RouteOptions>>();
|
||||||
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1055,7 +1055,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
|
||||||
{
|
{
|
||||||
var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
|
var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
|
||||||
var serviceProvider = services.BuildServiceProvider();
|
var serviceProvider = services.BuildServiceProvider();
|
||||||
var accessor = serviceProvider.GetService<IOptions<RouteOptions>>();
|
var accessor = serviceProvider.GetRequiredService<IOptions<RouteOptions>>();
|
||||||
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -823,7 +823,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
|
||||||
{
|
{
|
||||||
var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
|
var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
|
||||||
var serviceProvider = services.BuildServiceProvider();
|
var serviceProvider = services.BuildServiceProvider();
|
||||||
var accessor = serviceProvider.GetService<IOptions<RouteOptions>>();
|
var accessor = serviceProvider.GetRequiredService<IOptions<RouteOptions>>();
|
||||||
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -481,7 +481,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
|
||||||
{
|
{
|
||||||
var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
|
var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
|
||||||
var serviceProvider = services.BuildServiceProvider();
|
var serviceProvider = services.BuildServiceProvider();
|
||||||
var accessor = serviceProvider.GetService<IOptions<RouteOptions>>();
|
var accessor = serviceProvider.GetRequiredService<IOptions<RouteOptions>>();
|
||||||
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Routing.Tests
|
||||||
{
|
{
|
||||||
var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
|
var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
|
||||||
var serviceProvider = services.BuildServiceProvider();
|
var serviceProvider = services.BuildServiceProvider();
|
||||||
var accessor = serviceProvider.GetService<IOptions<RouteOptions>>();
|
var accessor = serviceProvider.GetRequiredService<IOptions<RouteOptions>>();
|
||||||
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
return new DefaultInlineConstraintResolver(serviceProvider, accessor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue