From 9cb441ba9baf83952bdb06270517f4eef470be27 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Wed, 24 Jan 2018 19:59:21 -0600 Subject: [PATCH] fix async json responses --- .../V1/Controllers/EntityController.cs | 24 +++++++++---------- .../V1/Controllers/ListsController.cs | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/FilterLists.Api/V1/Controllers/EntityController.cs b/src/FilterLists.Api/V1/Controllers/EntityController.cs index c92492893..c2212e23e 100644 --- a/src/FilterLists.Api/V1/Controllers/EntityController.cs +++ b/src/FilterLists.Api/V1/Controllers/EntityController.cs @@ -27,40 +27,40 @@ private async Task GetSeed(string controllerName) switch (controllerName) { case "lists": - return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, entry => + return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, async entry => { entry.SlidingExpiration = TimeSpan.FromSeconds(3); - return Task.FromResult(Json(SeedService.GetAllFilterLists())); + return Json(await SeedService.GetAllFilterLists()); }); case "languages": - return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, entry => + return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, async entry => { entry.SlidingExpiration = TimeSpan.FromSeconds(3); - return Task.FromResult(Json(SeedService.GetAllLanguages())); + return Json(await SeedService.GetAllLanguages()); }); case "licenses": - return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, entry => + return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, async entry => { entry.SlidingExpiration = TimeSpan.FromSeconds(3); - return Task.FromResult(Json(SeedService.GetAllLicenses())); + return Json(await SeedService.GetAllLicenses()); }); case "maintainers": - return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, entry => + return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, async entry => { entry.SlidingExpiration = TimeSpan.FromSeconds(3); - return Task.FromResult(Json(SeedService.GetAllMaintainers())); + return Json(await SeedService.GetAllMaintainers()); }); case "software": - return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, entry => + return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, async entry => { entry.SlidingExpiration = TimeSpan.FromSeconds(3); - return Task.FromResult(Json(SeedService.GetAllSoftware())); + return Json(await SeedService.GetAllSoftware()); }); case "syntaxes": - return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, entry => + return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, async entry => { entry.SlidingExpiration = TimeSpan.FromSeconds(3); - return Task.FromResult(Json(SeedService.GetAllSyntaxes())); + return Json(await SeedService.GetAllSyntaxes()); }); default: return await Task.FromResult(NotFound()); diff --git a/src/FilterLists.Api/V1/Controllers/ListsController.cs b/src/FilterLists.Api/V1/Controllers/ListsController.cs index 27c94f039..fad2e026f 100644 --- a/src/FilterLists.Api/V1/Controllers/ListsController.cs +++ b/src/FilterLists.Api/V1/Controllers/ListsController.cs @@ -19,10 +19,10 @@ public ListsController(IMemoryCache memoryCache, SeedService seedService, Filter [HttpGet] public async Task Index() { - return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, entry => + return await MemoryCache.GetOrCreateAsync(CacheKeys.Entry, async entry => { entry.SlidingExpiration = TimeSpan.FromSeconds(3); - return Task.FromResult(Json(filterListService.GetAllSummaries())); + return Json(await filterListService.GetAllSummaries()); }); } }