introduce ScopedServiceProvider and fix tests

Author: jaredcnance

README.md

@@ -7,7 +7,6 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/9fvgeoxdikwkom10?svg=true)](https://ci.appveyor.com/project/jaredcnance/jsonapidotnetcore)
 [![Travis](https://travis-ci.org/json-api-dotnet/JsonApiDotNetCore.svg?branch=master)](https://travis-ci.org/json-api-dotnet/JsonApiDotNetCore)
 [![NuGet](https://img.shields.io/nuget/v/JsonApiDotNetCore.svg)](https://www.nuget.org/packages/JsonApiDotNetCore/)
-[![MyGet CI](https://img.shields.io/myget/research-institute/vpre/JsonApiDotNetCore.svg)](https://www.myget.org/feed/research-institute/package/nuget/JsonApiDotNetCore)
 [![Join the chat at https://gitter.im/json-api-dotnet-core/Lobby](https://badges.gitter.im/json-api-dotnet-core/Lobby.svg)](https://gitter.im/json-api-dotnet-core/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![FIRST-TIMERS](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/)
 

src/Examples/NoEntityFrameworkExample/Startup.cs

@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Logging;
 using NoEntityFrameworkExample.Services;
 using Microsoft.EntityFrameworkCore;
+using System;
 
 namespace NoEntityFrameworkExample
 {
@@ -27,7 +28,7 @@ public Startup(IHostingEnvironment env)
         public IConfigurationRoot Configuration { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
+        public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
             var mvcBuilder = services.AddMvc();
@@ -46,6 +47,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IConfiguration>(Configuration);
             services.AddSingleton<DbContextOptions<AppDbContext>>(optionsBuilder.Options);
             services.AddScoped<AppDbContext>();
+
+            return services.BuildServiceProvider();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/Examples/OperationsExample/Startup.cs

@@ -32,10 +32,7 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)
 
             services.AddSingleton<ILoggerFactory>(loggerFactory);
 
-            services.AddDbContext<AppDbContext>(options =>
-            {
-                options.UseNpgsql(GetDbConnectionString());
-            }, ServiceLifetime.Transient);
+            services.AddDbContext<AppDbContext>(options => options.UseNpgsql(GetDbConnectionString()), ServiceLifetime.Scoped);
 
             services.AddJsonApi<AppDbContext>(opt => opt.EnableOperations = true);
 

src/Examples/ReportsExample/Startup.cs

@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace ReportsExample
 {
@@ -28,12 +23,13 @@ public Startup(IHostingEnvironment env)
             Config = builder.Build();
         }
 
-        public void ConfigureServices(IServiceCollection services)
+        public virtual void ConfigureServices(IServiceCollection services)
         {
             var mvcBuilder = services.AddMvc();
             services.AddJsonApi(opt =>
             {
-                opt.BuildContextGraph(builder => {
+                opt.BuildContextGraph(builder =>
+                {
                     builder.AddResource<Report>("reports");
                 });
                 opt.Namespace = "api";

src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs

@@ -105,9 +105,13 @@ public class JsonApiOptions
         public NullAttributeResponseBehavior NullAttributeResponseBehavior { get; set; }
 
         /// <summary>
-        /// Whether or not to allow json:api v1.1 operation requests
-        /// This will be enabled by default in JsonApiDotNetCore v2.2.1
+        /// Whether or not to allow json:api v1.1 operation requests.
+        /// This is a beta feature and there may be breaking changes
+        /// in subsequent releases.
         /// </summary>
+        /// <remarks>
+        /// This will be enabled by default in JsonApiDotNetCore v2.2.1
+        /// </remarks>
         public bool EnableOperations { get; set; }
 
         [Obsolete("JsonContract resolver can now be set on SerializerSettings.")]

src/JsonApiDotNetCore/Extensions/DbContextExtensions.cs

@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using System.Reflection;
 using System;
 
 namespace JsonApiDotNetCore.Extensions

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -6,7 +6,6 @@
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Generics;
 using JsonApiDotNetCore.Middleware;
-using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCore.Services.Operations;
@@ -89,7 +88,7 @@ public static void AddJsonApiInternals(
             this IServiceCollection services,
             JsonApiOptions jsonApiOptions)
         {
-            if (!jsonApiOptions.ContextGraph.UsesDbContext)
+            if (jsonApiOptions.ContextGraph.UsesDbContext == false)
             {
                 services.AddScoped<DbContext>();
                 services.AddSingleton<DbContextOptions>(new DbContextOptionsBuilder().Options);
@@ -122,6 +121,7 @@ public static void AddJsonApiInternals(
             services.AddSingleton<IContextGraph>(jsonApiOptions.ContextGraph);
             services.AddScoped<IJsonApiContext, JsonApiContext>();
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+            services.AddScoped<IScopedServiceProvider, RequestScopedServiceProvider>();
             services.AddScoped<JsonApiRouteHandler>();
             services.AddScoped<IMetaBuilder, MetaBuilder>();
             services.AddScoped<IDocumentBuilder, DocumentBuilder>();

src/JsonApiDotNetCore/Internal/Generics/GenericProcessorFactory.cs

@@ -1,3 +1,4 @@
+using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Http;
 using System;
 
@@ -35,9 +36,9 @@ public class GenericProcessorFactory : IGenericProcessorFactory
     {
         private readonly IServiceProvider _serviceProvider;
 
-        public GenericProcessorFactory(IHttpContextAccessor httpContextAccessor)
+        public GenericProcessorFactory(IScopedServiceProvider serviceProvider)
         {
-            _serviceProvider = httpContextAccessor.HttpContext.RequestServices;
+            _serviceProvider = serviceProvider;
         }
 
         public TInterface GetProcessor<TInterface>(Type openGenericType, Type resourceType)

src/JsonApiDotNetCore/Services/ScopedServiceProvider.cs

@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Http;
+using System;
+
+namespace JsonApiDotNetCore.Services
+{
+    /// <summary>
+    /// An interface used to separate the registration of the global ServiceProvider
+    /// from a request scoped service provider. This is useful in cases when we need to 
+    /// manually resolve services from the request scope (e.g. operation processors)
+    /// </summary>
+    public interface IScopedServiceProvider : IServiceProvider { }
+
+    /// <summary>
+    /// A service provider that uses the current HttpContext request scope
+    /// </summary>
+    public class RequestScopedServiceProvider : IScopedServiceProvider
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public RequestScopedServiceProvider(IHttpContextAccessor httpContextAccessor)
+        {
+            _serviceProvider = httpContextAccessor.HttpContext.RequestServices;
+        }
+
+        /// <inheritdoc />
+        public object GetService(Type serviceType) => _serviceProvider.GetService(serviceType);
+    }
+}

src/JsonApiDotNetCore/api/.manifest

@@ -283,7 +283,7 @@
   "JsonApiDotNetCore.Internal.Generics.GenericProcessor`2.SetRelationships(System.Object,JsonApiDotNetCore.Models.RelationshipAttribute,System.Collections.Generic.IEnumerable{System.String})": "JsonApiDotNetCore.Internal.Generics.GenericProcessor-2.yml",
   "JsonApiDotNetCore.Internal.Generics.GenericProcessor`2.UpdateRelationshipsAsync(System.Object,JsonApiDotNetCore.Models.RelationshipAttribute,System.Collections.Generic.IEnumerable{System.String})": "JsonApiDotNetCore.Internal.Generics.GenericProcessor-2.yml",
   "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory": "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.yml",
-  "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.#ctor(Microsoft.AspNetCore.Http.IHttpContextAccessor)": "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.yml",
+  "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.#ctor(JsonApiDotNetCore.Services.IScopedServiceProvider)": "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.yml",
   "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.GetProcessor``1(System.Type,System.Type)": "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.yml",
   "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.GetProcessor``1(System.Type,System.Type,System.Type)": "JsonApiDotNetCore.Internal.Generics.GenericProcessorFactory.yml",
   "JsonApiDotNetCore.Internal.Generics.IGenericProcessor": "JsonApiDotNetCore.Internal.Generics.IGenericProcessor.yml",
@@ -586,6 +586,7 @@
   "JsonApiDotNetCore.Services.IResourceQueryService`2": "JsonApiDotNetCore.Services.IResourceQueryService-2.yml",
   "JsonApiDotNetCore.Services.IResourceService`1": "JsonApiDotNetCore.Services.IResourceService-1.yml",
   "JsonApiDotNetCore.Services.IResourceService`2": "JsonApiDotNetCore.Services.IResourceService-2.yml",
+  "JsonApiDotNetCore.Services.IScopedServiceProvider": "JsonApiDotNetCore.Services.IScopedServiceProvider.yml",
   "JsonApiDotNetCore.Services.IUpdateRelationshipService`1": "JsonApiDotNetCore.Services.IUpdateRelationshipService-1.yml",
   "JsonApiDotNetCore.Services.IUpdateRelationshipService`2": "JsonApiDotNetCore.Services.IUpdateRelationshipService-2.yml",
   "JsonApiDotNetCore.Services.IUpdateRelationshipService`2.UpdateRelationshipsAsync(`1,System.String,System.Collections.Generic.List{JsonApiDotNetCore.Models.DocumentData})": "JsonApiDotNetCore.Services.IUpdateRelationshipService-2.yml",
@@ -673,5 +674,8 @@
   "JsonApiDotNetCore.Services.QueryParser.ParseFilterQuery(System.String,System.String)": "JsonApiDotNetCore.Services.QueryParser.yml",
   "JsonApiDotNetCore.Services.QueryParser.ParseIncludedRelationships(System.String)": "JsonApiDotNetCore.Services.QueryParser.yml",
   "JsonApiDotNetCore.Services.QueryParser.ParsePageQuery(JsonApiDotNetCore.Internal.Query.PageQuery,System.String,System.String)": "JsonApiDotNetCore.Services.QueryParser.yml",
-  "JsonApiDotNetCore.Services.QueryParser.ParseSortParameters(System.String)": "JsonApiDotNetCore.Services.QueryParser.yml"
+  "JsonApiDotNetCore.Services.QueryParser.ParseSortParameters(System.String)": "JsonApiDotNetCore.Services.QueryParser.yml",
+  "JsonApiDotNetCore.Services.RequestScopedServiceProvider": "JsonApiDotNetCore.Services.RequestScopedServiceProvider.yml",
+  "JsonApiDotNetCore.Services.RequestScopedServiceProvider.#ctor(Microsoft.AspNetCore.Http.IHttpContextAccessor)": "JsonApiDotNetCore.Services.RequestScopedServiceProvider.yml",
+  "JsonApiDotNetCore.Services.RequestScopedServiceProvider.GetService(System.Type)": "JsonApiDotNetCore.Services.RequestScopedServiceProvider.yml"
 }