From 7b8a515dcb3c43f57988b9f13b12a0da281ec063 Mon Sep 17 00:00:00 2001 From: Adarsh Jha Date: Thu, 2 Nov 2023 19:44:03 +0530 Subject: [PATCH] Bug Fix: Removing Hardcoded 'id' csharp-function (#16963) * Bug Fix: Removing Hardcoded 'id' csharp-function * Bug Fix: Removing Hardcoded 'id' csharp-function * Bug Fix: Removing Whitespace --- .../csharp-functions/function.mustache | 8 +-- .../src/Org.OpenAPITools/Functions/PetApi.cs | 64 +++++++------------ .../Org.OpenAPITools/Functions/StoreApi.cs | 32 ++++------ .../src/Org.OpenAPITools/Functions/UserApi.cs | 64 +++++++------------ 4 files changed, 63 insertions(+), 105 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache index 95e3a4274cc..d288160670c 100644 --- a/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache @@ -22,11 +22,9 @@ namespace {{apiPackage}} {{#generateBody}} { var method = this.GetType().GetMethod("{{operationId}}"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<{{{returnType}}}>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<{{{returnType}}}>)method.Invoke(this, new object[] { req, context{{#allParams}}{{#isPathParam}}, {{>paramName}}{{/isPathParam}}{{/allParams}} })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } {{/generateBody}} {{/operation}} diff --git a/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/PetApi.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/PetApi.cs index 2e606b0a8c1..330b31105f6 100644 --- a/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/PetApi.cs +++ b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/PetApi.cs @@ -21,88 +21,72 @@ namespace Org.OpenAPITools.Functions public async Task> _AddPet([HttpTrigger(AuthorizationLevel.Anonymous, "Post", Route = "v2pet")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("AddPet"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("PetApi_DeletePet")] public async Task> _DeletePet([HttpTrigger(AuthorizationLevel.Anonymous, "Delete", Route = "v2pet/{petId}")]HttpRequest req, ExecutionContext context, long petId) { var method = this.GetType().GetMethod("DeletePet"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context, petId })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("PetApi_FindPetsByStatus")] public async Task>> _FindPetsByStatus([HttpTrigger(AuthorizationLevel.Anonymous, "Get", Route = "v2pet/findByStatus")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("FindPetsByStatus"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task>)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("PetApi_FindPetsByTags")] public async Task>> _FindPetsByTags([HttpTrigger(AuthorizationLevel.Anonymous, "Get", Route = "v2pet/findByTags")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("FindPetsByTags"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task>)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("PetApi_GetPetById")] public async Task> _GetPetById([HttpTrigger(AuthorizationLevel.Anonymous, "Get", Route = "v2pet/{petId}")]HttpRequest req, ExecutionContext context, long petId) { var method = this.GetType().GetMethod("GetPetById"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task)method.Invoke(this, new object[] { req, context, petId })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("PetApi_UpdatePet")] public async Task> _UpdatePet([HttpTrigger(AuthorizationLevel.Anonymous, "Put", Route = "v2pet")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("UpdatePet"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("PetApi_UpdatePetWithForm")] public async Task> _UpdatePetWithForm([HttpTrigger(AuthorizationLevel.Anonymous, "Post", Route = "v2pet/{petId}")]HttpRequest req, ExecutionContext context, long petId) { var method = this.GetType().GetMethod("UpdatePetWithForm"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context, petId })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("PetApi_UploadFile")] public async Task> _UploadFile([HttpTrigger(AuthorizationLevel.Anonymous, "Post", Route = "v2pet/{petId}/uploadImage")]HttpRequest req, ExecutionContext context, long petId) { var method = this.GetType().GetMethod("UploadFile"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task)method.Invoke(this, new object[] { req, context, petId })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } } } diff --git a/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/StoreApi.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/StoreApi.cs index 560582f3374..47e383d4631 100644 --- a/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/StoreApi.cs +++ b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/StoreApi.cs @@ -21,44 +21,36 @@ namespace Org.OpenAPITools.Functions public async Task> _DeleteOrder([HttpTrigger(AuthorizationLevel.Anonymous, "Delete", Route = "v2store/order/{orderId}")]HttpRequest req, ExecutionContext context, string orderId) { var method = this.GetType().GetMethod("DeleteOrder"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context, orderId })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("StoreApi_GetInventory")] public async Task>> _GetInventory([HttpTrigger(AuthorizationLevel.Anonymous, "Get", Route = "v2store/inventory")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("GetInventory"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task>)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("StoreApi_GetOrderById")] public async Task> _GetOrderById([HttpTrigger(AuthorizationLevel.Anonymous, "Get", Route = "v2store/order/{orderId}")]HttpRequest req, ExecutionContext context, [Range(1, 5)]long orderId) { var method = this.GetType().GetMethod("GetOrderById"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task)method.Invoke(this, new object[] { req, context, orderId })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("StoreApi_PlaceOrder")] public async Task> _PlaceOrder([HttpTrigger(AuthorizationLevel.Anonymous, "Post", Route = "v2store/order")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("PlaceOrder"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } } } diff --git a/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/UserApi.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/UserApi.cs index a4219eb43ce..4f39d98f3f0 100644 --- a/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/UserApi.cs +++ b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/UserApi.cs @@ -21,88 +21,72 @@ namespace Org.OpenAPITools.Functions public async Task> _CreateUser([HttpTrigger(AuthorizationLevel.Anonymous, "Post", Route = "v2user")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("CreateUser"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("UserApi_CreateUsersWithArrayInput")] public async Task> _CreateUsersWithArrayInput([HttpTrigger(AuthorizationLevel.Anonymous, "Post", Route = "v2user/createWithArray")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("CreateUsersWithArrayInput"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("UserApi_CreateUsersWithListInput")] public async Task> _CreateUsersWithListInput([HttpTrigger(AuthorizationLevel.Anonymous, "Post", Route = "v2user/createWithList")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("CreateUsersWithListInput"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("UserApi_DeleteUser")] public async Task> _DeleteUser([HttpTrigger(AuthorizationLevel.Anonymous, "Delete", Route = "v2user/{username}")]HttpRequest req, ExecutionContext context, string username) { var method = this.GetType().GetMethod("DeleteUser"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context, username })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("UserApi_GetUserByName")] public async Task> _GetUserByName([HttpTrigger(AuthorizationLevel.Anonymous, "Get", Route = "v2user/{username}")]HttpRequest req, ExecutionContext context, string username) { var method = this.GetType().GetMethod("GetUserByName"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task)method.Invoke(this, new object[] { req, context, username })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("UserApi_LoginUser")] public async Task> _LoginUser([HttpTrigger(AuthorizationLevel.Anonymous, "Get", Route = "v2user/login")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("LoginUser"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("UserApi_LogoutUser")] public async Task> _LogoutUser([HttpTrigger(AuthorizationLevel.Anonymous, "Get", Route = "v2user/logout")]HttpRequest req, ExecutionContext context) { var method = this.GetType().GetMethod("LogoutUser"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } [FunctionName("UserApi_UpdateUser")] public async Task> _UpdateUser([HttpTrigger(AuthorizationLevel.Anonymous, "Put", Route = "v2user/{username}")]HttpRequest req, ExecutionContext context, string username) { var method = this.GetType().GetMethod("UpdateUser"); - if(method == null) - { - return new StatusCodeResult((int)HttpStatusCode.NotImplemented); - } - return (await ((Task<>)method.Invoke(this, new object[] { req, context, id })).ConfigureAwait(false)); + return method != null + ? (await ((Task<>)method.Invoke(this, new object[] { req, context, username })).ConfigureAwait(false)) + : new StatusCodeResult((int)HttpStatusCode.NotImplemented); } } }