async routing

Author: jaredcnance

JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs

@@ -30,7 +30,7 @@ public async Task Invoke(HttpContext context)
         _logger.LogInformation("Passing request to JsonApiService: " + context.Request.Path);
 
         if(IsJsonApiRequest(context)) {
-          var routeWasHandled = _router.HandleJsonApiRoute(context, _serviceProvider);
+          var routeWasHandled = await _router.HandleJsonApiRouteAsync(context, _serviceProvider);
           if(!routeWasHandled)
             RespondNotFound(context);
         }

JsonApiDotNetCore/Routing/IRouter.cs

@@ -1,10 +1,11 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
 namespace JsonApiDotNetCore.Routing
 {
   public interface IRouter
   {
-    bool HandleJsonApiRoute(HttpContext context, IServiceProvider serviceProvider);
+    Task<bool> HandleJsonApiRouteAsync(HttpContext context, IServiceProvider serviceProvider);
   }
 }

JsonApiDotNetCore/Routing/Router.cs

@@ -1,90 +1,89 @@
 using System;
 using System.Text;
+using System.Threading.Tasks;
 using JsonApiDotNetCore.Abstractions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
 
 namespace JsonApiDotNetCore.Routing
 {
-  public class Router : IRouter
-  {
-    private readonly JsonApiModelConfiguration _jsonApiModelConfiguration;
-    private IServiceProvider _serviceProvider;
-    private JsonApiContext _jsonApiContext;
-    private IRouteBuilder _routeBuilder;
-    private IControllerBuilder _controllerBuilder;
-
-    public Router(JsonApiModelConfiguration configuration, IRouteBuilder routeBuilder, IControllerBuilder controllerBuilder)
+    public class Router : IRouter
     {
-      _jsonApiModelConfiguration = configuration;
-      _routeBuilder = routeBuilder;
-      _controllerBuilder = controllerBuilder;
-    }
+        private readonly JsonApiModelConfiguration _jsonApiModelConfiguration;
+        private IServiceProvider _serviceProvider;
+        private JsonApiContext _jsonApiContext;
+        private IRouteBuilder _routeBuilder;
+        private IControllerBuilder _controllerBuilder;
 
-    public bool HandleJsonApiRoute(HttpContext context, IServiceProvider serviceProvider)
-    {
-      _serviceProvider = serviceProvider;
+        public Router(JsonApiModelConfiguration configuration, IRouteBuilder routeBuilder, IControllerBuilder controllerBuilder)
+        {
+            _jsonApiModelConfiguration = configuration;
+            _routeBuilder = routeBuilder;
+            _controllerBuilder = controllerBuilder;
+        }
 
-      var route = _routeBuilder.BuildFromRequest(context.Request);
-      if (route == null) return false;
+        public async Task<bool> HandleJsonApiRouteAsync(HttpContext context, IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
 
-      InitializeContext(context, route);
-      CallController();
+            var route = _routeBuilder.BuildFromRequest(context.Request);
+            if (route == null) return false;
 
-      return true;
-    }
+            InitializeContext(context, route);
+            await CallController();
 
-    private void InitializeContext(HttpContext context, Route route)
-    {
-      var dbContext = _serviceProvider.GetService(_jsonApiModelConfiguration.ContextType);
-      _jsonApiContext = new JsonApiContext(context, route, dbContext, _jsonApiModelConfiguration);
-    }
+            return true;
+        }
 
-    private void CallController()
-    {
-      var controller = _controllerBuilder.BuildController(_jsonApiContext);
+        private void InitializeContext(HttpContext context, Route route)
+        {
+            var dbContext = _serviceProvider.GetService(_jsonApiModelConfiguration.ContextType);
+            _jsonApiContext = new JsonApiContext(context, route, dbContext, _jsonApiModelConfiguration);
+        }
 
-      var result = ActivateControllerMethod(controller);
+        private async Task CallController()
+        {
+            var controller = _controllerBuilder.BuildController(_jsonApiContext);
 
-      result.Value = SerializeResult(result.Value);
+            var result = ActivateControllerMethod(controller);
 
-      SendResponse(result);
-    }
+            result.Value = SerializeResult(result.Value);
 
-    private ObjectResult ActivateControllerMethod(IJsonApiController controller)
-    {
-      var route = _jsonApiContext.Route;
-      switch (route.RequestMethod)
-      {
-        case "GET":
-          return string.IsNullOrEmpty(route.ResourceId) ? controller.Get() : controller.Get(route.ResourceId);
-        case "POST":
-          return controller.Post(new JsonApiDeserializer(_jsonApiContext).GetEntityFromRequest());
-        case "PATCH":
-          return controller.Patch(route.ResourceId, new JsonApiDeserializer(_jsonApiContext).GetEntityPatch());
-        case "DELETE":
-          return controller.Delete(route.ResourceId);
-        default:
-          throw new ArgumentException("Request method not supported", nameof(route));
-      }
-    }
+            await SendResponse(result);
+        }
 
-    private object SerializeResult(object result)
-    {
-      return result == null ? null : new JsonApiSerializer(_jsonApiContext).ToJsonApiDocument(result);
-    }
+        private ObjectResult ActivateControllerMethod(IJsonApiController controller)
+        {
+            var route = _jsonApiContext.Route;
+            switch (route.RequestMethod)
+            {
+                case "GET":
+                    return string.IsNullOrEmpty(route.ResourceId) ? controller.Get() : controller.Get(route.ResourceId);
+                case "POST":
+                    return controller.Post(new JsonApiDeserializer(_jsonApiContext).GetEntityFromRequest());
+                case "PATCH":
+                    return controller.Patch(route.ResourceId, new JsonApiDeserializer(_jsonApiContext).GetEntityPatch());
+                case "DELETE":
+                    return controller.Delete(route.ResourceId);
+                default:
+                    throw new ArgumentException("Request method not supported", nameof(route));
+            }
+        }
 
-    private void SendResponse(ObjectResult result)
-    {
-      var context = _jsonApiContext.HttpContext;
-      context.Response.StatusCode = result.StatusCode ?? 500;
-      context.Response.ContentType = "application/vnd.api+json";
-      context.Response.WriteAsync(result.Value == null ? "" : result.Value.ToString(), Encoding.UTF8);
-      context.Response.Body.Flush();
+        private object SerializeResult(object result)
+        {
+            return result == null ? null : new JsonApiSerializer(_jsonApiContext).ToJsonApiDocument(result);
+        }
+
+        private async Task SendResponse(ObjectResult result)
+        {
+            var context = _jsonApiContext.HttpContext;
+            context.Response.StatusCode = result.StatusCode ?? 500;
+            context.Response.ContentType = "application/vnd.api+json";
+            await context.Response.WriteAsync(result.Value == null ? "" : result.Value.ToString(), Encoding.UTF8);
+        }
     }
-  }
 }