Skip to content

Commit 9dbd6ac

Browse files
PicazsooPicazsoo
committed
fix tests
1 parent e6d81a3 commit 9dbd6ac

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

‎modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@ private void verifyGeneratedFilesContain(Map<Path, List<String>> expectedSnippet
11301130
}
11311131

11321132
@Test
1133-
public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger() throws Exception {
1133+
public void reactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDelegate() throws Exception {
11341134
Path root = generateApiSources2(Map.of(
11351135
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
11361136
KotlinSpringServerCodegen.REACTIVE, true,
@@ -1148,16 +1148,16 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger() thro
11481148
verifyGeneratedFilesContain(
11491149
Map.of(
11501150
root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of(
1151-
"deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,",
1152-
"getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"),
1151+
"deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Unit>",
1152+
"getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Pet>"),
11531153
root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of(
1154-
"logoutUser(@Parameter(hidden = true)")
1154+
"logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange)")
11551155
)
11561156
);
11571157
}
11581158

11591159
@Test
1160-
public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1() throws Exception {
1160+
public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoDelegate() throws Exception {
11611161
Path root = generateApiSources2(Map.of(
11621162
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
11631163
KotlinSpringServerCodegen.REACTIVE, true,
@@ -1175,16 +1175,16 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1() thr
11751175
verifyGeneratedFilesContain(
11761176
Map.of(
11771177
root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of(
1178-
"deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,",
1179-
"getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"),
1178+
"deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Unit>",
1179+
"getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Pet>"),
11801180
root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of(
1181-
"logoutUser(@ApiParam(hidden = true)")
1181+
"logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange")
11821182
)
11831183
);
11841184
}
11851185

11861186
@Test
1187-
public void reactiveWithHttpRequestContextControllerImplAnnotationNone() throws Exception {
1187+
public void reactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception {
11881188
Path root = generateApiSources2(Map.of(
11891189
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
11901190
KotlinSpringServerCodegen.REACTIVE, true,
@@ -1211,7 +1211,7 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationNone() throws
12111211
}
12121212

12131213
@Test
1214-
public void reactiveWithoutHttpRequestContextControllerImplAnnotationNone() throws Exception {
1214+
public void reactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception {
12151215
Path root = generateApiSources2(Map.of(
12161216
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false,
12171217
KotlinSpringServerCodegen.REACTIVE, true,
@@ -1238,7 +1238,7 @@ public void reactiveWithoutHttpRequestContextControllerImplAnnotationNone() thro
12381238
}
12391239

12401240
@Test
1241-
public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger() throws Exception {
1241+
public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDelegate() throws Exception {
12421242
Path root = generateApiSources2(Map.of(
12431243
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
12441244
KotlinSpringServerCodegen.REACTIVE, false,
@@ -1256,16 +1256,16 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger() t
12561256
verifyGeneratedFilesContain(
12571257
Map.of(
12581258
root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of(
1259-
"deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,",
1260-
"getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"),
1259+
"deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Unit>",
1260+
"getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Pet>"),
12611261
root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of(
1262-
"logoutUser(@Parameter(hidden = true)")
1262+
"logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Unit>")
12631263
)
12641264
);
12651265
}
12661266

12671267
@Test
1268-
public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1() throws Exception {
1268+
public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoDelegate() throws Exception {
12691269
Path root = generateApiSources2(Map.of(
12701270
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
12711271
KotlinSpringServerCodegen.REACTIVE, false,
@@ -1283,16 +1283,16 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1()
12831283
verifyGeneratedFilesContain(
12841284
Map.of(
12851285
root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of(
1286-
"deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,",
1287-
"getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"),
1286+
"deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Unit>",
1287+
"getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Pet>"),
12881288
root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of(
1289-
"logoutUser(@ApiParam(hidden = true)")
1289+
"logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Unit>")
12901290
)
12911291
);
12921292
}
12931293

12941294
@Test
1295-
public void nonReactiveWithHttpRequestContextControllerImplAnnotationNone() throws Exception {
1295+
public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception {
12961296
Path root = generateApiSources2(Map.of(
12971297
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
12981298
KotlinSpringServerCodegen.REACTIVE, false,
@@ -1319,7 +1319,7 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNone() thro
13191319
}
13201320

13211321
@Test
1322-
public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNone() throws Exception {
1322+
public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception {
13231323
Path root = generateApiSources2(Map.of(
13241324
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false,
13251325
KotlinSpringServerCodegen.REACTIVE, false,
@@ -1346,7 +1346,7 @@ public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNone() t
13461346
}
13471347

13481348
@Test
1349-
public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throws Exception {
1349+
public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDelegate() throws Exception {
13501350
Path root = generateApiSources2(Map.of(
13511351
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
13521352
KotlinSpringServerCodegen.REACTIVE, true,
@@ -1364,16 +1364,16 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throw
13641364
verifyGeneratedFilesContain(
13651365
Map.of(
13661366
root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of(
1367-
"deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,",
1368-
"getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"),
1367+
"deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Unit>",
1368+
"getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Pet>"),
13691369
root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of(
1370-
"logoutUser(@Parameter(hidden = true)")
1370+
"logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Unit>")
13711371
)
13721372
);
13731373
}
13741374

13751375
@Test
1376-
public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() throws Exception {
1376+
public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDelegate() throws Exception {
13771377
Path root = generateApiSources2(Map.of(
13781378
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
13791379
KotlinSpringServerCodegen.REACTIVE, true,
@@ -1391,16 +1391,16 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() thro
13911391
verifyGeneratedFilesContain(
13921392
Map.of(
13931393
root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of(
1394-
"deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,",
1395-
"getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"),
1394+
"deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Unit>",
1395+
"getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Pet>"),
13961396
root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of(
1397-
"logoutUser(@ApiParam(hidden = true)")
1397+
"logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity<Unit>")
13981398
)
13991399
);
14001400
}
14011401

14021402
@Test
1403-
public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception {
1403+
public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception {
14041404
Path root = generateApiSources2(Map.of(
14051405
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
14061406
KotlinSpringServerCodegen.REACTIVE, true,
@@ -1427,7 +1427,7 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws E
14271427
}
14281428

14291429
@Test
1430-
public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception {
1430+
public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception {
14311431
Path root = generateApiSources2(Map.of(
14321432
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false,
14331433
KotlinSpringServerCodegen.REACTIVE, true,
@@ -1454,7 +1454,7 @@ public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throw
14541454
}
14551455

14561456
@Test
1457-
public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throws Exception {
1457+
public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDelegate() throws Exception {
14581458
Path root = generateApiSources2(Map.of(
14591459
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
14601460
KotlinSpringServerCodegen.REACTIVE, false,
@@ -1472,16 +1472,16 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() th
14721472
verifyGeneratedFilesContain(
14731473
Map.of(
14741474
root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of(
1475-
"deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,",
1476-
"getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"),
1475+
"deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Unit>",
1476+
"getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Pet>"),
14771477
root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of(
1478-
"logoutUser(@Parameter(hidden = true)")
1478+
"logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Unit>")
14791479
)
14801480
);
14811481
}
14821482

14831483
@Test
1484-
public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() throws Exception {
1484+
public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDelegate() throws Exception {
14851485
Path root = generateApiSources2(Map.of(
14861486
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
14871487
KotlinSpringServerCodegen.REACTIVE, false,
@@ -1499,16 +1499,16 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() t
14991499
verifyGeneratedFilesContain(
15001500
Map.of(
15011501
root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of(
1502-
"deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,",
1503-
"getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"),
1502+
"deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Unit>",
1503+
"getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Pet>"),
15041504
root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of(
1505-
"logoutUser(@ApiParam(hidden = true)")
1505+
"logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity<Unit>")
15061506
)
15071507
);
15081508
}
15091509

15101510
@Test
1511-
public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception {
1511+
public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception {
15121512
Path root = generateApiSources2(Map.of(
15131513
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true,
15141514
KotlinSpringServerCodegen.REACTIVE, false,
@@ -1535,7 +1535,7 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throw
15351535
}
15361536

15371537
@Test
1538-
public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception {
1538+
public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception {
15391539
Path root = generateApiSources2(Map.of(
15401540
KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false,
15411541
KotlinSpringServerCodegen.REACTIVE, false,

0 commit comments

Comments
 (0)