Skip to content

Commit da86be4

Browse files
PicazsooPicazsoo
committed
fix samples up to date
1 parent bd6c1ef commit da86be4

File tree

15 files changed

+352
-176
lines changed

15 files changed

+352
-176
lines changed

‎modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@ class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) v
8686
notes = "{{#lambda.escapeDollar}}{{{notes}}}{{/lambda.escapeDollar}}"{{#returnBaseType}},
8787
response = {{{.}}}::class{{/returnBaseType}}{{#returnContainer}},
8888
responseContainer = "{{{.}}}"{{/returnContainer}}{{#hasAuthMethods}},
89-
authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}})
89+
authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}}
90+
)
9091
@ApiResponses(
91-
value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{#lambda.escapeDollar}}{{{message}}}{{/lambda.escapeDollar}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}}
92+
value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{#lambda.escapeDollar}}{{{message}}}{{/lambda.escapeDollar}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]
93+
){{/swagger1AnnotationLibrary}}
9294
@RequestMapping(
9395
method = [RequestMethod.{{httpMethod}}],
9496
value = [PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}} /* "{{{path}}}" */]{{#singleContentTypes}}{{#hasProduces}},

‎samples/server/petstore/kotlin-springboot-dollar-issue-swagger1/src/main/kotlin/org/openapitools/api/ItemsApiController.kt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ class ItemsApiController(@Autowired(required = true) val service: ItemsApiServic
4141
value = "SQ = \"; SBS = \\; DBS = \\\\; SD = \$some",
4242
nickname = "itemsItemIdSomethingItemSubIdGet",
4343
notes = "SQ = \"; SBS = \\; DBS = \\\\; SD = \$some",
44-
response = ItemsItemIdSomethingItemSubIdGet200Response::class)
44+
response = ItemsItemIdSomethingItemSubIdGet200Response::class
45+
)
4546
@ApiResponses(
46-
value = [ApiResponse(code = 200, message = "SQ = \"; SBS = \\; DBS = \\\\; SD = \$some", response = ItemsItemIdSomethingItemSubIdGet200Response::class)])
47+
value = [ApiResponse(code = 200, message = "SQ = \"; SBS = \\; DBS = \\\\; SD = \$some", response = ItemsItemIdSomethingItemSubIdGet200Response::class)]
48+
)
4749
@RequestMapping(
4850
method = [RequestMethod.GET],
4951
value = [PATH_ITEMS_ITEM_ID_SOMETHING_ITEM_SUB_ID_GET /* "/items/{item$Id}/something/{item$SubId}" */],
@@ -67,9 +69,11 @@ class ItemsApiController(@Autowired(required = true) val service: ItemsApiServic
6769
value = "SQ = \"; SBS = \\; DBS = \\\\; SD = \$some",
6870
nickname = "itemsPost",
6971
notes = "SQ = \"; SBS = \\; DBS = \\\\; SD = \$some",
70-
response = ItemWithDollarAttributesAndExamples::class)
72+
response = ItemWithDollarAttributesAndExamples::class
73+
)
7174
@ApiResponses(
72-
value = [ApiResponse(code = 201, message = "SQ = \"; SBS = \\; DBS = \\\\; SD = \$some", response = ItemWithDollarAttributesAndExamples::class)])
75+
value = [ApiResponse(code = 201, message = "SQ = \"; SBS = \\; DBS = \\\\; SD = \$some", response = ItemWithDollarAttributesAndExamples::class)]
76+
)
7377
@RequestMapping(
7478
method = [RequestMethod.POST],
7579
value = [PATH_ITEMS_POST /* "/items" */],

‎samples/server/petstore/kotlin-springboot-dollar-issue-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
4141
value = "Add a new pet to the store",
4242
nickname = "addPet",
4343
notes = "",
44-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
44+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
45+
)
4546
@ApiResponses(
46-
value = [ApiResponse(code = 405, message = "Invalid input")])
47+
value = [ApiResponse(code = 405, message = "Invalid input")]
48+
)
4749
@RequestMapping(
4850
method = [RequestMethod.POST],
4951
value = [PATH_ADD_PET /* "/pet" */],
@@ -60,9 +62,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
6062
value = "Deletes a pet",
6163
nickname = "deletePet",
6264
notes = "",
63-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
65+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
66+
)
6467
@ApiResponses(
65-
value = [ApiResponse(code = 400, message = "Invalid pet value")])
68+
value = [ApiResponse(code = 400, message = "Invalid pet value")]
69+
)
6670
@RequestMapping(
6771
method = [RequestMethod.DELETE],
6872
value = [PATH_DELETE_PET /* "/pet/{petId}" */]
@@ -81,9 +85,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
8185
notes = "Multiple status values can be provided with comma separated strings",
8286
response = Pet::class,
8387
responseContainer = "List",
84-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
88+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
89+
)
8590
@ApiResponses(
86-
value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")])
91+
value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")]
92+
)
8793
@RequestMapping(
8894
method = [RequestMethod.GET],
8995
value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */],
@@ -102,9 +108,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
102108
notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
103109
response = Pet::class,
104110
responseContainer = "List",
105-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
111+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
112+
)
106113
@ApiResponses(
107-
value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")])
114+
value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")]
115+
)
108116
@RequestMapping(
109117
method = [RequestMethod.GET],
110118
value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */],
@@ -122,9 +130,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
122130
nickname = "getImage",
123131
notes = "",
124132
response = org.springframework.core.io.Resource::class,
125-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
133+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
134+
)
126135
@ApiResponses(
127-
value = [ApiResponse(code = 200, message = "successful operation", response = org.springframework.core.io.Resource::class)])
136+
value = [ApiResponse(code = 200, message = "successful operation", response = org.springframework.core.io.Resource::class)]
137+
)
128138
@RequestMapping(
129139
method = [RequestMethod.GET],
130140
value = [PATH_GET_IMAGE /* "/pet/{petId}/getImage" */],
@@ -142,9 +152,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
142152
nickname = "getPetById",
143153
notes = "Returns a single pet",
144154
response = Pet::class,
145-
authorizations = [Authorization(value = "api_key")])
155+
authorizations = [Authorization(value = "api_key")]
156+
)
146157
@ApiResponses(
147-
value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")])
158+
value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")]
159+
)
148160
@RequestMapping(
149161
method = [RequestMethod.GET],
150162
value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */],
@@ -161,9 +173,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
161173
value = "Update an existing pet",
162174
nickname = "updatePet",
163175
notes = "",
164-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
176+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
177+
)
165178
@ApiResponses(
166-
value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")])
179+
value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")]
180+
)
167181
@RequestMapping(
168182
method = [RequestMethod.PUT],
169183
value = [PATH_UPDATE_PET /* "/pet" */],
@@ -180,9 +194,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
180194
value = "Updates a pet in the store with form data",
181195
nickname = "updatePetWithForm",
182196
notes = "",
183-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
197+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
198+
)
184199
@ApiResponses(
185-
value = [ApiResponse(code = 405, message = "Invalid input")])
200+
value = [ApiResponse(code = 405, message = "Invalid input")]
201+
)
186202
@RequestMapping(
187203
method = [RequestMethod.POST],
188204
value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */],
@@ -202,9 +218,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
202218
nickname = "uploadFile",
203219
notes = "",
204220
response = ModelApiResponse::class,
205-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
221+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
222+
)
206223
@ApiResponses(
207-
value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)])
224+
value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]
225+
)
208226
@RequestMapping(
209227
method = [RequestMethod.POST],
210228
value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */],
@@ -225,9 +243,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
225243
nickname = "uploadMultipleFile",
226244
notes = "",
227245
response = ModelApiResponse::class,
228-
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
246+
authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]
247+
)
229248
@ApiResponses(
230-
value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)])
249+
value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]
250+
)
231251
@RequestMapping(
232252
method = [RequestMethod.POST],
233253
value = [PATH_UPLOAD_MULTIPLE_FILE /* "/pet/{petId}/uploadMultipleImage" */],

‎samples/server/petstore/kotlin-springboot-dollar-issue-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
3939
@ApiOperation(
4040
value = "Delete purchase order by ID",
4141
nickname = "deleteOrder",
42-
notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors")
42+
notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
43+
)
4344
@ApiResponses(
44-
value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
45+
value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]
46+
)
4547
@RequestMapping(
4648
method = [RequestMethod.DELETE],
4749
value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */]
@@ -59,9 +61,11 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
5961
notes = "Returns a map of status codes to quantities",
6062
response = kotlin.Int::class,
6163
responseContainer = "Map",
62-
authorizations = [Authorization(value = "api_key")])
64+
authorizations = [Authorization(value = "api_key")]
65+
)
6366
@ApiResponses(
64-
value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")])
67+
value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]
68+
)
6569
@RequestMapping(
6670
method = [RequestMethod.GET],
6771
value = [PATH_GET_INVENTORY /* "/store/inventory" */],
@@ -76,9 +80,11 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
7680
value = "Find purchase order by ID",
7781
nickname = "getOrderById",
7882
notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
79-
response = Order::class)
83+
response = Order::class
84+
)
8085
@ApiResponses(
81-
value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
86+
value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]
87+
)
8288
@RequestMapping(
8389
method = [RequestMethod.GET],
8490
value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */],
@@ -95,9 +101,11 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
95101
value = "Place an order for a pet",
96102
nickname = "placeOrder",
97103
notes = "",
98-
response = Order::class)
104+
response = Order::class
105+
)
99106
@ApiResponses(
100-
value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")])
107+
value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")]
108+
)
101109
@RequestMapping(
102110
method = [RequestMethod.POST],
103111
value = [PATH_PLACE_ORDER /* "/store/order" */],

0 commit comments

Comments
 (0)