Change GetService calls to GetRequiredService

GetRequiredService throws for missing services like GetService used to.
This commit is contained in:
Stephen Halter 2014-10-17 15:31:57 -07:00
parent 30a4ee1ce1
commit fff1d62f01
9 changed files with 9 additions and 9 deletions

View File

@ -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,

View File

@ -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>();
} }
} }

View File

@ -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>();
} }
} }

View File

@ -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);
} }

View File

@ -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);
} }

View File

@ -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);
} }

View File

@ -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);
} }
} }

View File

@ -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);
} }

View File

@ -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);
} }
} }