From fd6597a0ecca90114060181e7bd8e135672083fb Mon Sep 17 00:00:00 2001 From: exsersewo Date: Tue, 2 Feb 2021 19:48:10 +0000 Subject: [PATCH] Async/Await TableController, mv LICENSE, fix pipeline --- .github/LICENSE => LICENSE | 0 azure-pipelines.yml | 2 +- src/RestAPI.sln | 4 +++- src/RestAPI/Controllers/TableController.cs | 21 +++++++++++---------- 4 files changed, 15 insertions(+), 12 deletions(-) rename .github/LICENSE => LICENSE (100%) diff --git a/.github/LICENSE b/LICENSE similarity index 100% rename from .github/LICENSE rename to LICENSE diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0ab5a5c..07b7a4b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,4 +36,4 @@ steps: platform: 'x64' solution: '$(solution)' configuration: '$(buildConfiguration)' - msbuildArgs: '/p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload' + platform: '$(buildPlatform)' diff --git a/src/RestAPI.sln b/src/RestAPI.sln index 5a3dd9a..b48899e 100644 --- a/src/RestAPI.sln +++ b/src/RestAPI.sln @@ -8,6 +8,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{197287CE-CDEF-4FF8-9846-EFF913496E1A}" ProjectSection(SolutionItems) = preProject ..\.env.default = ..\.env.default + ..\azure-pipelines.yml = ..\azure-pipelines.yml + ..\NuGet.config = ..\NuGet.config EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{98D984C1-F9F9-4D41-8CDA-4D87F5C0A774}" @@ -19,7 +21,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Github", "Github", "{766907EE-8F38-477E-BD1D-F34EA54AC784}" ProjectSection(SolutionItems) = preProject ..\.github\LICENSE = ..\.github\LICENSE - ..\.github\README = ..\.github\README + ..\.github\README.md = ..\.github\README.md EndProjectSection EndProject Global diff --git a/src/RestAPI/Controllers/TableController.cs b/src/RestAPI/Controllers/TableController.cs index 2702c36..250302d 100644 --- a/src/RestAPI/Controllers/TableController.cs +++ b/src/RestAPI/Controllers/TableController.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Dynamic; using System.Linq; using System.Net; +using System.Threading.Tasks; using System.Xml; // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 @@ -38,7 +39,7 @@ namespace RestAPI.Controllers } } - private dynamic ConvertResponse(List>> tableContent, string format, HttpResponse Response) + private static dynamic ConvertResponse(List>> tableContent, string format, HttpResponse Response) { switch (format.ToLowerInvariant()) { @@ -46,7 +47,7 @@ namespace RestAPI.Controllers { Response.ContentType = "application/json"; - List content = new List(); + List content = new(); foreach (var result in tableContent) { @@ -147,9 +148,9 @@ namespace RestAPI.Controllers } [HttpGet("{table}.{format}")] - public dynamic Get(string table, string format) + public async Task GetAsync(string table, string format) { - database.OpenAsync().GetAwaiter().GetResult(); + await database.OpenAsync(); string tableLocation = table; @@ -158,9 +159,9 @@ namespace RestAPI.Controllers tableLocation = $"public.{table}"; } - if (database.DoesTableExistAsync(tableLocation).GetAwaiter().GetResult()) + if (await database.DoesTableExistAsync(tableLocation)) { - var tableContent = database.GetTableAsync(tableLocation, BlacklistedFields.ToArray()).GetAwaiter().GetResult(); + var tableContent = await database.GetTableAsync(tableLocation, BlacklistedFields.ToArray()); dynamic response = null; if (tableContent != null) @@ -184,9 +185,9 @@ namespace RestAPI.Controllers } [HttpGet("{area}/{table}.{format}")] - public dynamic Get(string area, string table, string format) + public async Task GetAsync(string area, string table, string format) { - database.OpenAsync().GetAwaiter().GetResult(); + await database.OpenAsync(); string tableLocation; @@ -199,9 +200,9 @@ namespace RestAPI.Controllers tableLocation = $"{area}/{table}"; //default assumption for now } - if (database.DoesTableExistAsync(tableLocation).GetAwaiter().GetResult()) + if (await database.DoesTableExistAsync(tableLocation)) { - var tableContent = database.GetTableAsync(tableLocation, BlacklistedFields.ToArray()).GetAwaiter().GetResult(); + var tableContent = await database.GetTableAsync(tableLocation, BlacklistedFields.ToArray()); dynamic response = null; if (tableContent != null)