Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{^required}}{{#isEnumOrRef}}?.let { runCatching { {{{dataType}}}.fromValue(it) }.getOrElse { throw BadParameterException(message = "Invalid enum value for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isEnumOrRef}}{{#isNumber}}?.let { runCatching { it.to{{{dataType}}}() }.getOrElse { throw BadParameterException(message = "Invalid number format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{^isString}}{{^isEnumOrRef}}{{^isNumber}}?.let { runCatching { it.to{{{dataType}}}() }.getOrElse { throw BadParameterException(message = "Invalid format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{/isEnumOrRef}}{{/isString}}{{/required}}{{#required}}{{#defaultValue}}{{#isString}}{{/isString}}{{#isEnumOrRef}}?.let { runCatching { {{{dataType}}}.fromValue(it) }.getOrElse { throw BadParameterException(message = "Invalid enum value for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isEnumOrRef}}{{#isNumber}}?.let { runCatching { it.to{{{dataType}}}() }.getOrElse { throw BadParameterException(message = "Invalid number format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{^isString}}{{^isEnumOrRef}}{{^isNumber}}?.let { runCatching { it.to{{{dataType}}}() }.getOrElse { throw BadParameterException(message = "Invalid format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{/isEnumOrRef}}{{/isString}} ?: {{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}.let { it{{#isString}}{{/isString}}{{#isEnumOrRef}}?.let { runCatching { {{{dataType}}}.fromValue(it) }.getOrElse { throw BadParameterException(message = "Invalid enum value for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isEnumOrRef}}{{#isNumber}}?.let { runCatching { it.to{{{dataType}}}() }.getOrElse { throw BadParameterException(message = "Invalid number format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{^isString}}{{^isEnumOrRef}}{{^isNumber}}?.let { runCatching { it.to{{{dataType}}}() }.getOrElse { throw BadParameterException(message = "Invalid format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{/isEnumOrRef}}{{/isString}} ?: throw BadParameterException(message = "Missing {{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isCookieParam}}cookie{{/isCookieParam}}{{#isFormParam}}form{{/isFormParam}} parameter: {{baseName}}", parameterName = "{{baseName}}", validationType = "required") }{{/defaultValue}}{{/required}}
{{^required}}{{#isEnumOrRef}}?.let { runCatching { {{{dataType}}}.fromValue(it) }.getOrElse { throw BadParameterException(message = "Invalid enum value for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isEnumOrRef}}{{#isNumber}}?.let { runCatching { it.toBigDecimal() }.getOrElse { throw BadParameterException(message = "Invalid number format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{^isString}}{{^isEnumOrRef}}{{^isNumber}}?.let { runCatching { {{#isBoolean}}it.toBoolean(){{/isBoolean}}{{#isInteger}}it.toInt(){{/isInteger}}{{#isLong}}it.toLong(){{/isLong}}{{#isFloat}}it.toFloat(){{/isFloat}}{{#isDouble}}it.toDouble(){{/isDouble}}{{^isBoolean}}{{^isInteger}}{{^isLong}}{{^isFloat}}{{^isDouble}}it.to{{{dataType}}}(){{/isDouble}}{{/isFloat}}{{/isLong}}{{/isInteger}}{{/isBoolean}} }.getOrElse { throw BadParameterException(message = "Invalid format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{/isEnumOrRef}}{{/isString}}{{/required}}{{#required}}{{#defaultValue}}{{#isString}}{{/isString}}{{#isEnumOrRef}}?.let { runCatching { {{{dataType}}}.fromValue(it) }.getOrElse { throw BadParameterException(message = "Invalid enum value for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isEnumOrRef}}{{#isNumber}}?.let { runCatching { it.toBigDecimal() }.getOrElse { throw BadParameterException(message = "Invalid number format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{^isString}}{{^isEnumOrRef}}{{^isNumber}}?.let { runCatching { {{#isBoolean}}it.toBoolean(){{/isBoolean}}{{#isInteger}}it.toInt(){{/isInteger}}{{#isLong}}it.toLong(){{/isLong}}{{#isFloat}}it.toFloat(){{/isFloat}}{{#isDouble}}it.toDouble(){{/isDouble}}{{^isBoolean}}{{^isInteger}}{{^isLong}}{{^isFloat}}{{^isDouble}}it.to{{{dataType}}}(){{/isDouble}}{{/isFloat}}{{/isLong}}{{/isInteger}}{{/isBoolean}} }.getOrElse { throw BadParameterException(message = "Invalid format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{/isEnumOrRef}}{{/isString}} ?: {{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}.let { it{{#isString}}{{/isString}}{{#isEnumOrRef}}?.let { runCatching { {{{dataType}}}.fromValue(it) }.getOrElse { throw BadParameterException(message = "Invalid enum value for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isEnumOrRef}}{{#isNumber}}?.let { runCatching { it.toBigDecimal() }.getOrElse { throw BadParameterException(message = "Invalid number format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{^isString}}{{^isEnumOrRef}}{{^isNumber}}?.let { runCatching { {{#isBoolean}}it.toBoolean(){{/isBoolean}}{{#isInteger}}it.toInt(){{/isInteger}}{{#isLong}}it.toLong(){{/isLong}}{{#isFloat}}it.toFloat(){{/isFloat}}{{#isDouble}}it.toDouble(){{/isDouble}}{{^isBoolean}}{{^isInteger}}{{^isLong}}{{^isFloat}}{{^isDouble}}it.to{{{dataType}}}(){{/isDouble}}{{/isFloat}}{{/isLong}}{{/isInteger}}{{/isBoolean}} }.getOrElse { throw BadParameterException(message = "Invalid format for parameter {{baseName}}: $it", parameterName = "{{baseName}}") } }{{/isNumber}}{{/isEnumOrRef}}{{/isString}} ?: throw BadParameterException(message = "Missing {{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isCookieParam}}cookie{{/isCookieParam}}{{#isFormParam}}form{{/isFormParam}} parameter: {{baseName}}", parameterName = "{{baseName}}", validationType = "required") }{{/defaultValue}}{{/required}}
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,48 @@ public void delegatePattern_enumWireValue() throws IOException {
);
}

@Test
public void delegatePattern_headerParamPrimitiveConversion() throws IOException {
// Regression test for https://github.com/OpenAPITools/openapi-generator/issues/24214
// Header params were converted with `it.to<fully.qualified.DataType>()`
// (e.g. `it.tokotlin.Boolean()`, `it.tojava.math.BigDecimal()`), which is not valid Kotlin.
// The correct String extension is `it.to<SimpleName>()`.
File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
output.deleteOnExit();

KotlinServerCodegen codegen = new KotlinServerCodegen();
codegen.setOutputDir(output.getAbsolutePath());
codegen.additionalProperties().put(LIBRARY, KTOR);
codegen.additionalProperties().put(DELEGATE_PATTERN, true);

new DefaultGenerator().opts(new ClientOptInput()
.openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue24214-ktor-header-param-conversion.yaml"))
.config(codegen))
.generate();

Path apiPath = Paths.get(output.getAbsolutePath()
+ "/src/main/kotlin/org/openapitools/server/apis/DefaultApi.kt");

assertFileContains(
apiPath,
"val boolHeader = call.request.headers[\"bool-header\"]?.let { runCatching { it.toBoolean() }",
"val intHeader = call.request.headers[\"int-header\"]?.let { runCatching { it.toInt() }",
"val longHeader = call.request.headers[\"long-header\"]?.let { runCatching { it.toLong() }",
"val doubleHeader = call.request.headers[\"double-header\"]?.let { runCatching { it.toDouble() }",
"val numberHeader = call.request.headers[\"number-header\"]?.let { runCatching { it.toBigDecimal() }"
);

// The old, uncompilable fully-qualified conversions must be gone.
assertFileNotContains(
apiPath,
"it.tokotlin.Boolean()",
"it.tokotlin.Int()",
"it.tokotlin.Long()",
"it.tokotlin.Double()",
"it.tojava.math.BigDecimal()"
);
}


@Test
public void testFloatingPointMultipleOfValidationUsesTolerance() throws IOException {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
openapi: 3.0.3
info:
title: ktor header param primitive conversion
version: 1.0.0
paths:
/headers:
get:
operationId: getWithHeaders
parameters:
- name: bool-header
in: header
required: false
schema:
type: boolean
- name: int-header
in: header
required: false
schema:
type: integer
format: int32
- name: long-header
in: header
required: false
schema:
type: integer
format: int64
- name: double-header
in: header
required: false
schema:
type: number
format: double
- name: number-header
in: header
required: false
schema:
type: number
responses:
'200':
description: ok
Loading