fix missing )

OpenAPITools · Jan 27, 2019 · f837cdc · f837cdc
1 parent 5613706
commit f837cdc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache
@@ -26,7 +26,7 @@ namespace {{packageName}}.Controllers
         /// <response code="{{code}}">{{message}}</response>{{/responses}}
         [{{httpMethod}}]
         [Route("{{{basePathWithoutHost}}}{{{path}}}")]{{#hasAuthMethods}}
-{{#authMethods}}{{#isBasicBearer}}        [Authorize{{#scopes}}(Roles = "{{scope}}{{#hasMore}},{{/hasMore}}"{{/scopes}}]{{/isBasicBearer}}{{/authMethods}}
+{{#authMethods}}{{#isBasicBearer}}        [Authorize{{#scopes}}(Roles = "{{scope}}{{#hasMore}},{{/hasMore}}"){{/scopes}}]{{/isBasicBearer}}{{/authMethods}}
 {{/hasAuthMethods}}
         [ValidateModelState]{{#useSwashbuckle}}
         [SwaggerOperation("{{operationId}}")]{{#responses}}{{#dataType}}

diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs
@@ -17,6 +17,7 @@
 using System.ComponentModel.DataAnnotations;
 using Org.OpenAPITools.Attributes;
 using Org.OpenAPITools.Models;
+using Microsoft.AspNetCore.Authorization;
 
 namespace Org.OpenAPITools.Controllers
 { 
@@ -32,6 +33,7 @@ public class PetApiController : ControllerBase
         /// <response code="405">Invalid input</response>
         [HttpPost]
         [Route("/v2/pet")]
+
         [ValidateModelState]
         [SwaggerOperation("AddPet")]
         public virtual IActionResult AddPet([FromBody]Pet body)
@@ -51,6 +53,7 @@ public virtual IActionResult AddPet([FromBody]Pet body)
         /// <response code="400">Invalid pet value</response>
         [HttpDelete]
         [Route("/v2/pet/{petId}")]
+
         [ValidateModelState]
         [SwaggerOperation("DeletePet")]
         public virtual IActionResult DeletePet([FromRoute][Required]long? petId, [FromHeader]string apiKey)
@@ -71,6 +74,7 @@ public virtual IActionResult DeletePet([FromRoute][Required]long? petId, [FromHe
         /// <response code="400">Invalid status value</response>
         [HttpGet]
         [Route("/v2/pet/findByStatus")]
+
         [ValidateModelState]
         [SwaggerOperation("FindPetsByStatus")]
         [SwaggerResponse(statusCode: 200, type: typeof(List<Pet>), description: "successful operation")]
@@ -102,6 +106,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery][Required()]List<string
         /// <response code="400">Invalid tag value</response>
         [HttpGet]
         [Route("/v2/pet/findByTags")]
+
         [ValidateModelState]
         [SwaggerOperation("FindPetsByTags")]
         [SwaggerResponse(statusCode: 200, type: typeof(List<Pet>), description: "successful operation")]
@@ -134,6 +139,7 @@ public virtual IActionResult FindPetsByTags([FromQuery][Required()]List<string>
         /// <response code="404">Pet not found</response>
         [HttpGet]
         [Route("/v2/pet/{petId}")]
+
         [ValidateModelState]
         [SwaggerOperation("GetPetById")]
         [SwaggerResponse(statusCode: 200, type: typeof(Pet), description: "successful operation")]
@@ -168,6 +174,7 @@ public virtual IActionResult GetPetById([FromRoute][Required]long? petId)
         /// <response code="405">Validation exception</response>
         [HttpPut]
         [Route("/v2/pet")]
+
         [ValidateModelState]
         [SwaggerOperation("UpdatePet")]
         public virtual IActionResult UpdatePet([FromBody]Pet body)
@@ -194,6 +201,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet body)
         /// <response code="405">Invalid input</response>
         [HttpPost]
         [Route("/v2/pet/{petId}")]
+
         [ValidateModelState]
         [SwaggerOperation("UpdatePetWithForm")]
         public virtual IActionResult UpdatePetWithForm([FromRoute][Required]long? petId, [FromForm]string name, [FromForm]string status)
@@ -214,6 +222,7 @@ public virtual IActionResult UpdatePetWithForm([FromRoute][Required]long? petId,
         /// <response code="200">successful operation</response>
         [HttpPost]
         [Route("/v2/pet/{petId}/uploadImage")]
+
         [ValidateModelState]
         [SwaggerOperation("UploadFile")]
         [SwaggerResponse(statusCode: 200, type: typeof(ApiResponse), description: "successful operation")]

diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -17,6 +17,7 @@
 using System.ComponentModel.DataAnnotations;
 using Org.OpenAPITools.Attributes;
 using Org.OpenAPITools.Models;
+using Microsoft.AspNetCore.Authorization;
 
 namespace Org.OpenAPITools.Controllers
 { 
@@ -33,8 +34,7 @@ public class StoreApiController : ControllerBase
         /// <response code="400">Invalid ID supplied</response>
         /// <response code="404">Order not found</response>
         [HttpDelete]
-        [Route("/v2/store/order/{orderId}")]
-        [ValidateModelState]
+        [Route("/v2/store/order/{orderId}")]        [ValidateModelState]
         [SwaggerOperation("DeleteOrder")]
         public virtual IActionResult DeleteOrder([FromRoute][Required]string orderId)
         { 
@@ -55,6 +55,7 @@ public virtual IActionResult DeleteOrder([FromRoute][Required]string orderId)
         /// <response code="200">successful operation</response>
         [HttpGet]
         [Route("/v2/store/inventory")]
+
         [ValidateModelState]
         [SwaggerOperation("GetInventory")]
         [SwaggerResponse(statusCode: 200, type: typeof(Dictionary<string, int?>), description: "successful operation")]
@@ -81,8 +82,7 @@ public virtual IActionResult GetInventory()
         /// <response code="400">Invalid ID supplied</response>
         /// <response code="404">Order not found</response>
         [HttpGet]
-        [Route("/v2/store/order/{orderId}")]
-        [ValidateModelState]
+        [Route("/v2/store/order/{orderId}")]        [ValidateModelState]
         [SwaggerOperation("GetOrderById")]
         [SwaggerResponse(statusCode: 200, type: typeof(Order), description: "successful operation")]
         public virtual IActionResult GetOrderById([FromRoute][Required][Range(1, 5)]long? orderId)
@@ -114,8 +114,7 @@ public virtual IActionResult GetOrderById([FromRoute][Required][Range(1, 5)]long
         /// <response code="200">successful operation</response>
         /// <response code="400">Invalid Order</response>
         [HttpPost]
-        [Route("/v2/store/order")]
-        [ValidateModelState]
+        [Route("/v2/store/order")]        [ValidateModelState]
         [SwaggerOperation("PlaceOrder")]
         [SwaggerResponse(statusCode: 200, type: typeof(Order), description: "successful operation")]
         public virtual IActionResult PlaceOrder([FromBody]Order body)

diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs
@@ -17,6 +17,7 @@
 using System.ComponentModel.DataAnnotations;
 using Org.OpenAPITools.Attributes;
 using Org.OpenAPITools.Models;
+using Microsoft.AspNetCore.Authorization;
 
 namespace Org.OpenAPITools.Controllers
 { 
@@ -32,8 +33,7 @@ public class UserApiController : ControllerBase
         /// <param name="body">Created user object</param>
         /// <response code="0">successful operation</response>
         [HttpPost]
-        [Route("/v2/user")]
-        [ValidateModelState]
+        [Route("/v2/user")]        [ValidateModelState]
         [SwaggerOperation("CreateUser")]
         public virtual IActionResult CreateUser([FromBody]User body)
         { 
@@ -50,8 +50,7 @@ public virtual IActionResult CreateUser([FromBody]User body)
         /// <param name="body">List of user object</param>
         /// <response code="0">successful operation</response>
         [HttpPost]
-        [Route("/v2/user/createWithArray")]
-        [ValidateModelState]
+        [Route("/v2/user/createWithArray")]        [ValidateModelState]
         [SwaggerOperation("CreateUsersWithArrayInput")]
         public virtual IActionResult CreateUsersWithArrayInput([FromBody]List<User> body)
         { 
@@ -68,8 +67,7 @@ public virtual IActionResult CreateUsersWithArrayInput([FromBody]List<User> body
         /// <param name="body">List of user object</param>
         /// <response code="0">successful operation</response>
         [HttpPost]
-        [Route("/v2/user/createWithList")]
-        [ValidateModelState]
+        [Route("/v2/user/createWithList")]        [ValidateModelState]
         [SwaggerOperation("CreateUsersWithListInput")]
         public virtual IActionResult CreateUsersWithListInput([FromBody]List<User> body)
         { 
@@ -88,8 +86,7 @@ public virtual IActionResult CreateUsersWithListInput([FromBody]List<User> body)
         /// <response code="400">Invalid username supplied</response>
         /// <response code="404">User not found</response>
         [HttpDelete]
-        [Route("/v2/user/{username}")]
-        [ValidateModelState]
+        [Route("/v2/user/{username}")]        [ValidateModelState]
         [SwaggerOperation("DeleteUser")]
         public virtual IActionResult DeleteUser([FromRoute][Required]string username)
         { 
@@ -111,8 +108,7 @@ public virtual IActionResult DeleteUser([FromRoute][Required]string username)
         /// <response code="400">Invalid username supplied</response>
         /// <response code="404">User not found</response>
         [HttpGet]
-        [Route("/v2/user/{username}")]
-        [ValidateModelState]
+        [Route("/v2/user/{username}")]        [ValidateModelState]
         [SwaggerOperation("GetUserByName")]
         [SwaggerResponse(statusCode: 200, type: typeof(User), description: "successful operation")]
         public virtual IActionResult GetUserByName([FromRoute][Required]string username)
@@ -145,8 +141,7 @@ public virtual IActionResult GetUserByName([FromRoute][Required]string username)
         /// <response code="200">successful operation</response>
         /// <response code="400">Invalid username/password supplied</response>
         [HttpGet]
-        [Route("/v2/user/#")]
-        [ValidateModelState]
+        [Route("/v2/user/#")]        [ValidateModelState]
         [SwaggerOperation("LoginUser")]
         [SwaggerResponse(statusCode: 200, type: typeof(string), description: "successful operation")]
         public virtual IActionResult LoginUser([FromQuery][Required()]string username, [FromQuery][Required()]string password)
@@ -171,8 +166,7 @@ public virtual IActionResult LoginUser([FromQuery][Required()]string username, [
         /// </summary>
         /// <response code="0">successful operation</response>
         [HttpGet]
-        [Route("/v2/user/logout")]
-        [ValidateModelState]
+        [Route("/v2/user/logout")]        [ValidateModelState]
         [SwaggerOperation("LogoutUser")]
         public virtual IActionResult LogoutUser()
         { 
@@ -192,8 +186,7 @@ public virtual IActionResult LogoutUser()
         /// <response code="400">Invalid user supplied</response>
         /// <response code="404">User not found</response>
         [HttpPut]
-        [Route("/v2/user/{username}")]
-        [ValidateModelState]
+        [Route("/v2/user/{username}")]        [ValidateModelState]
         [SwaggerOperation("UpdateUser")]
         public virtual IActionResult UpdateUser([FromRoute][Required]string username, [FromBody]User body)
         {