Skip to content

Commit b87b6e9

Browse files
committed
remove "async" and "responseWrapper" from template as these are not supported by kotlin-spring generator
1 parent c52cc1f commit b87b6e9

2 files changed

Lines changed: 12 additions & 19 deletions

File tree

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ import kotlinx.coroutines.flow.Flow
1414
{{/reactive}}
1515

1616
import java.util.Optional
17-
{{#async}}
18-
import java.util.concurrent.CompletableFuture
19-
{{/async}}
2017

2118
{{#operations}}
2219
/**
@@ -35,7 +32,7 @@ interface {{classname}}Delegate {
3532
*/
3633
{{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}{{#isBodyParam}}Flow<{{{baseType}}}>{{/isBodyParam}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{/isArray}}{{/reactive}}{{^-last}},
3734
{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}},
38-
{{/hasParams}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}}{{^skipDefaultDelegateInterface}} {
35+
{{/hasParams}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): ResponseEntity<{{>returnTypes}}>{{^skipDefaultDelegateInterface}} {
3936
{{>methodBody}}{{! prevent indent}}
4037
}{{/skipDefaultDelegateInterface}}
4138

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
{{^reactive}}
22
{{#examples}}
33
{{#-first}}
4-
{{#async}}
5-
return CompletableFuture.supplyAsync(()-> {
6-
{{/async}}getRequest().ifPresent { request ->
7-
{{#async}} {{/async}} for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) {
4+
getRequest().ifPresent { request ->
5+
for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) {
86
{{/-first}}
9-
{{#async}} {{/async}}{{^async}} {{/async}} if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) {
10-
{{#async}} {{/async}}{{^async}} {{/async}} ApiUtil.setExampleResponse(request, "{{{contentType}}}", "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{example}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}")
11-
{{#async}} {{/async}}{{^async}} {{/async}} break
12-
{{#async}} {{/async}}{{^async}} {{/async}} }
7+
if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) {
8+
ApiUtil.setExampleResponse(request, "{{{contentType}}}", "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{example}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}")
9+
break
10+
}
1311
{{#-last}}
14-
{{#async}} {{/async}}{{^async}} {{/async}} }
15-
{{#async}} {{/async}} }
16-
{{#async}} {{/async}} return ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}})
17-
{{#async}}
18-
}, Runnable::run)
19-
{{/async}}
12+
}
13+
}
14+
return ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}})
15+
2016
{{/-last}}
2117
{{/examples}}
2218
{{^examples}}
23-
return {{#async}}CompletableFuture.completedFuture({{/async}}ResponseEntity({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}})
19+
return ResponseEntity({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}})
2420
{{/examples}}
2521
{{/reactive}}
2622
{{#reactive}}

0 commit comments

Comments
 (0)