-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[kotlin-client] New generator: kotlin-jvm-spring-restclient (#17366)
* Created kotlin jvm spring restclient * Fixed kotlin jvm-spring-restclient * Fixed earlier problems * Fixed earlier problems * Updated kotlin.md
- Loading branch information
1 parent
9eb5882
commit 7f05c1f
Showing
43 changed files
with
3,163 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| generatorName: kotlin | ||
| outputDir: samples/client/petstore/kotlin-jvm-spring-3-restclient | ||
| library: jvm-spring-restclient | ||
| inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml | ||
| templateDir: modules/openapi-generator/src/main/resources/kotlin-client | ||
| additionalProperties: | ||
| artifactId: kotlin-petstore-spring-restclient | ||
| enumUnknownDefaultCase: true | ||
| serializationLibrary: jackson | ||
| useSpringBoot3: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
...i-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/api.mustache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| {{>licenseInfo}} | ||
| package {{apiPackage}} | ||
|
|
||
| {{#jackson}} | ||
| import com.fasterxml.jackson.annotation.JsonProperty | ||
| {{/jackson}} | ||
|
|
||
| import org.springframework.web.client.RestClient | ||
| import org.springframework.web.client.RestClientResponseException | ||
|
|
||
| {{#jackson}} | ||
| import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter | ||
| {{/jackson}} | ||
| import org.springframework.http.ResponseEntity | ||
| import org.springframework.http.MediaType | ||
|
|
||
| {{#imports}}import {{import}} | ||
| {{/imports}} | ||
| import {{packageName}}.infrastructure.* | ||
|
|
||
| {{#operations}} | ||
| {{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(client: RestClient) : ApiClient(client) { | ||
| {{#jackson}} | ||
| constructor(baseUrl: String) : this(RestClient.builder() | ||
| .baseUrl(baseUrl) | ||
| .messageConverters { it.add(MappingJackson2HttpMessageConverter()) } | ||
| .build() | ||
| ) | ||
| {{/jackson}} | ||
|
|
||
| {{#operation}} | ||
| {{#allParams}} | ||
| {{#isEnum}} | ||
| /** | ||
| * enum for parameter {{paramName}} | ||
| */ | ||
| {{#nonPublicApi}}internal {{/nonPublicApi}}enum class {{enumName}}{{operationIdCamelCase}}(val value: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}) { | ||
| {{^enumUnknownDefaultCase}} | ||
| {{#allowableValues}} | ||
| {{#enumVars}} | ||
| {{#jackson}} | ||
| @JsonProperty(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}} | ||
| {{/jackson}} | ||
| {{/enumVars}} | ||
| {{/allowableValues}} | ||
| {{/enumUnknownDefaultCase}} | ||
| {{#enumUnknownDefaultCase}} | ||
| {{#allowableValues}} | ||
| {{#enumVars}} | ||
| {{^-last}} | ||
| {{#jackson}} | ||
| @JsonProperty(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}), | ||
| {{/jackson}} | ||
| {{/-last}} | ||
| {{/enumVars}} | ||
| {{/allowableValues}} | ||
| {{/enumUnknownDefaultCase}} | ||
| } | ||
|
|
||
| {{/isEnum}} | ||
| {{/allParams}} | ||
|
|
||
| @Throws(RestClientResponseException::class) | ||
| {{#isDeprecated}} | ||
| @Deprecated(message = "This operation is deprecated.") | ||
| {{/isDeprecated}} | ||
| fun {{operationId}}({{#allParams}}{{{paramName}}}: {{#isEnum}}{{#isContainer}}kotlin.collections.List<{{enumName}}{{operationIdCamelCase}}>{{/isContainer}}{{^isContainer}}{{enumName}}{{operationIdCamelCase}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}): {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} { | ||
| return {{operationId}}WithHttpInfo({{#allParams}}{{{paramName}}} = {{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) | ||
| .body!! | ||
| } | ||
|
|
||
| @Throws(RestClientResponseException::class) | ||
| {{#isDeprecated}} | ||
| @Deprecated(message = "This operation is deprecated.") | ||
| {{/isDeprecated}} | ||
| fun {{operationId}}WithHttpInfo({{#allParams}}{{{paramName}}}: {{#isEnum}}{{#isContainer}}kotlin.collections.List<{{enumName}}{{operationIdCamelCase}}>{{/isContainer}}{{^isContainer}}{{enumName}}{{operationIdCamelCase}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}): ResponseEntity<{{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}> { | ||
| val localVariableConfig = {{operationId}}RequestConfig({{#allParams}}{{{paramName}}} = {{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) | ||
| return request<{{#hasBodyParam}}{{#bodyParams}}{{{dataType}}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{^hasFormParams}}Unit{{/hasFormParams}}{{#hasFormParams}}Map<String, PartConfig<*>>{{/hasFormParams}}{{/hasBodyParam}}, {{{returnType}}}{{^returnType}}Unit{{/returnType}}>( | ||
| localVariableConfig | ||
| ) | ||
| } | ||
|
|
||
| {{#isDeprecated}} | ||
| @Deprecated(message = "This operation is deprecated.") | ||
| {{/isDeprecated}} | ||
| fun {{operationId}}RequestConfig({{#allParams}}{{{paramName}}}: {{#isEnum}}{{#isContainer}}kotlin.collections.List<{{enumName}}{{operationIdCamelCase}}>{{/isContainer}}{{^isContainer}}{{enumName}}{{operationIdCamelCase}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : RequestConfig<{{#hasBodyParam}}{{#bodyParams}}{{{dataType}}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{^hasFormParams}}Unit{{/hasFormParams}}{{#hasFormParams}}Map<String, PartConfig<*>>{{/hasFormParams}}{{/hasBodyParam}}> { | ||
| val localVariableBody = {{#hasBodyParam}}{{! | ||
| }}{{#bodyParams}}{{{paramName}}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{! | ||
| }}{{^hasFormParams}}null{{/hasFormParams}}{{! | ||
| }}{{#hasFormParams}}mapOf({{#formParams}} | ||
| "{{{baseName}}}" to PartConfig(body = {{{paramName}}}{{#isEnum}}.value{{/isEnum}}, headers = mutableMapOf({{#contentType}}"Content-Type" to "{{contentType}}"{{/contentType}})),{{! | ||
| }}{{/formParams}}){{/hasFormParams}}{{! | ||
| }}{{/hasBodyParam}} | ||
| val localVariableQuery = {{^hasQueryParams}}mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>() | ||
| {{/hasQueryParams}}{{#hasQueryParams}}mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>() | ||
| .apply { | ||
| {{#queryParams}} | ||
| {{^required}} | ||
| if ({{{paramName}}} != null) { | ||
| put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}){{/isContainer}}) | ||
| } | ||
| {{/required}} | ||
| {{#required}} | ||
| {{#isNullable}} | ||
| if ({{{paramName}}} != null) { | ||
| put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}){{/isContainer}}) | ||
| } | ||
| {{/isNullable}} | ||
| {{^isNullable}} | ||
| put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}){{/isContainer}}) | ||
| {{/isNullable}} | ||
| {{/required}} | ||
| {{/queryParams}} | ||
| } | ||
| {{/hasQueryParams}} | ||
| val localVariableHeaders: MutableMap<String, String> = mutableMapOf({{#hasFormParams}}"Content-Type" to {{^consumes}}"multipart/form-data"{{/consumes}}{{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{/hasFormParams}}) | ||
| {{#headerParams}} | ||
| {{{paramName}}}{{^required}}?{{/required}}.apply { localVariableHeaders["{{baseName}}"] = {{#isContainer}}this.joinToString(separator = collectionDelimiter("{{collectionFormat}}")){{/isContainer}}{{^isContainer}}this.toString(){{/isContainer}} } | ||
| {{/headerParams}} | ||
| {{^hasFormParams}}{{#hasConsumes}}{{#consumes}}localVariableHeaders["Content-Type"] = "{{{mediaType}}}" | ||
| {{/consumes}}{{/hasConsumes}}{{/hasFormParams}}{{#hasProduces}}localVariableHeaders["Accept"] = "{{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}" | ||
| {{/hasProduces}} | ||
|
|
||
| return RequestConfig( | ||
| method = RequestMethod.{{httpMethod}}, | ||
| path = "{{path}}"{{#pathParams}}.replace("{"+"{{baseName}}"+"}", encodeURIComponent({{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}.value{{/isEnum}}.toString(){{/isContainer}})){{/pathParams}}, | ||
| query = localVariableQuery, | ||
| headers = localVariableHeaders, | ||
| requiresAuthentication = {{#hasAuthMethods}}true{{/hasAuthMethods}}{{^hasAuthMethods}}false{{/hasAuthMethods}}, | ||
| body = localVariableBody | ||
| ) | ||
| } | ||
|
|
||
| {{/operation}} | ||
| } | ||
| {{/operations}} |
Oops, something went wrong.