From 50a7e12360247a3fe83065f911d2973d3f2d5983 Mon Sep 17 00:00:00 2001 From: Alex Humphreys Date: Fri, 30 Jan 2026 20:20:34 +0100 Subject: [PATCH 1/6] [kotlin][jvm-okhttp4] Fix multipart/form-data with JSON content-type Fixes #16457 Fixes two critical bugs in multipart/form-data handling when parts have Content-Type application/json: 1. IllegalArgumentException: OkHttp throws "Unexpected header: Content-Type" because Content-Type was passed in headers map instead of via asRequestBody(mediaType)/toRequestBody(mediaType) parameter. 2. Invalid JSON serialization: Non-file parts with application/json Content-Type were serialized using toString() instead of proper JSON serialization, producing invalid output like: "MyObject(field1=value, field2=123)" instead of '{"field1":"value","field2":123}' Changes: - Filter Content-Type from headers before passing to OkHttp - Check part Content-Type and use appropriate serializer (JSON vs toString) - Add integration tests with echo server to verify fix - Support all serialization libraries (gson, moshi, jackson, kotlinx) Fixes issues with multipart endpoints that mix file uploads with JSON metadata, common in REST APIs for document/image uploads. --- .../workflows/samples-kotlin-echo-api.yaml | 1 + .gitignore | 1 + .../infrastructure/ApiClient.kt.mustache | 28 +- .../3_0/kotlin/echo_multipart_json.yaml | 69 ++++ .../.openapi-generator-ignore | 23 ++ .../.openapi-generator/FILES | 24 ++ .../.openapi-generator/VERSION | 1 + .../README.md | 61 +++ .../build.gradle | 75 ++++ .../docs/BodyApi.md | 57 +++ .../docs/FileMetadata.md | 12 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43504 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../kotlin-jvm-okhttp-multipart-json/gradlew | 252 ++++++++++++ .../gradlew.bat | 94 +++++ .../settings.gradle | 1 + .../org/openapitools/client/apis/BodyApi.kt | 129 ++++++ .../client/infrastructure/ApiAbstractions.kt | 23 ++ .../client/infrastructure/ApiClient.kt | 371 ++++++++++++++++++ .../client/infrastructure/ApiResponse.kt | 43 ++ .../client/infrastructure/ByteArrayAdapter.kt | 33 ++ .../client/infrastructure/Errors.kt | 18 + .../client/infrastructure/LocalDateAdapter.kt | 35 ++ .../infrastructure/LocalDateTimeAdapter.kt | 35 ++ .../infrastructure/OffsetDateTimeAdapter.kt | 35 ++ .../client/infrastructure/PartConfig.kt | 11 + .../client/infrastructure/RequestConfig.kt | 19 + .../client/infrastructure/RequestMethod.kt | 8 + .../infrastructure/ResponseExtensions.kt | 24 ++ .../client/infrastructure/Serializer.kt | 22 ++ .../client/models/FileMetadata.kt | 45 +++ .../client/EchoServerResponseParser.kt | 44 +++ .../openapitools/client/MultipartJsonTest.kt | 69 ++++ .../openapitools/client/apis/BodyApiTest.kt | 39 ++ .../client/models/FileMetadataTest.kt | 47 +++ 35 files changed, 1753 insertions(+), 3 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/kotlin/echo_multipart_json.yaml create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator-ignore create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/FILES create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/VERSION create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/README.md create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/build.gradle create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/docs/BodyApi.md create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/docs/FileMetadata.md create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradle/wrapper/gradle-wrapper.properties create mode 100755 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradlew create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradlew.bat create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/settings.gradle create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/apis/BodyApi.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/models/FileMetadata.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/EchoServerResponseParser.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/MultipartJsonTest.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/apis/BodyApiTest.kt create mode 100644 samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/models/FileMetadataTest.kt diff --git a/.github/workflows/samples-kotlin-echo-api.yaml b/.github/workflows/samples-kotlin-echo-api.yaml index 683f06f070bf..a5e73a4ff4ee 100644 --- a/.github/workflows/samples-kotlin-echo-api.yaml +++ b/.github/workflows/samples-kotlin-echo-api.yaml @@ -20,6 +20,7 @@ jobs: - samples/client/echo_api/kotlin-jvm-spring-3-restclient - samples/client/echo_api/kotlin-model-prefix-type-mappings - samples/client/echo_api/kotlin-jvm-okhttp + - samples/client/echo_api/kotlin-jvm-okhttp-multipart-json steps: - uses: actions/checkout@v5 - uses: actions/setup-java@v5 diff --git a/.gitignore b/.gitignore index 203a85a3de8b..b08a0113f7c7 100644 --- a/.gitignore +++ b/.gitignore @@ -230,6 +230,7 @@ samples/client/petstore/kotlin*/build/ samples/server/others/kotlin-server/jaxrs-spec/build/ samples/client/echo_api/kotlin-jvm-spring-3-restclient/build/ samples/client/echo_api/kotlin-jvm-okhttp/build/ +samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/build/ # haskell .stack-work diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache index 3e5fe0a2557d..5b885ba971b5 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache @@ -127,7 +127,9 @@ import com.squareup.moshi.adapter * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -148,11 +150,31 @@ import com.squareup.moshi.adapter * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + {{#moshi}} + Serializer.moshi.adapter(Any::class.java).toJson(obj) + {{/moshi}} + {{#gson}} + Serializer.gson.toJson(obj) + {{/gson}} + {{#jackson}} + Serializer.jacksonObjectMapper.writeValueAsString(obj) + {{/jackson}} + {{#kotlinx_serialization}} + Serializer.kotlinxSerializationJson.encodeToString(obj) + {{/kotlinx_serialization}} + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/echo_multipart_json.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/echo_multipart_json.yaml new file mode 100644 index 000000000000..b6554b7d078e --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/echo_multipart_json.yaml @@ -0,0 +1,69 @@ +openapi: 3.0.0 +servers: + - url: 'http://localhost:3000/' +info: + version: 1.0.0 + title: Echo API for Kotlin Multipart JSON Test + description: Echo server API to test multipart/form-data with JSON content-type + license: + name: Apache-2.0 + url: 'https://www.apache.org/licenses/LICENSE-2.0.html' +tags: + - name: body + description: Test body operations +paths: + /body/multipart/formdata/with_json_part: + post: + tags: + - body + summary: Test multipart with JSON part + description: Test multipart/form-data with a part that has Content-Type application/json + operationId: testBodyMultipartFormdataWithJsonPart + requestBody: + required: true + content: + multipart/form-data: + schema: + type: object + required: + - metadata + - file + properties: + metadata: + $ref: '#/components/schemas/FileMetadata' + file: + type: string + format: binary + description: File to upload + encoding: + metadata: + contentType: application/json + file: + contentType: image/jpeg + responses: + '200': + description: Successful operation + content: + text/plain: + schema: + type: string +components: + schemas: + FileMetadata: + type: object + required: + - id + - name + properties: + id: + type: integer + format: int64 + example: 12345 + name: + type: string + example: test-file + tags: + type: array + items: + type: string + example: ["tag1", "tag2"] diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator-ignore b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/FILES b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/FILES new file mode 100644 index 000000000000..08fa2c06cf1b --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/FILES @@ -0,0 +1,24 @@ +README.md +build.gradle +docs/BodyApi.md +docs/FileMetadata.md +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +settings.gradle +src/main/kotlin/org/openapitools/client/apis/BodyApi.kt +src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt +src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt +src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt +src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt +src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt +src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt +src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt +src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt +src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt +src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt +src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +src/main/kotlin/org/openapitools/client/models/FileMetadata.kt diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/VERSION b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/VERSION new file mode 100644 index 000000000000..193a12d6e891 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.20.0-SNAPSHOT diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/README.md b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/README.md new file mode 100644 index 000000000000..91065665a8c5 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/README.md @@ -0,0 +1,61 @@ +# org.openapitools.client - Kotlin client library for Echo API for Kotlin Multipart JSON Test + +Echo server API to test multipart/form-data with JSON content-type + +## Overview +This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client. + +- API version: 1.0.0 +- Package version: +- Generator version: 7.20.0-SNAPSHOT +- Build package: org.openapitools.codegen.languages.KotlinClientCodegen + +## Requires + +* Kotlin 2.2.20 +* Gradle 8.14 + +## Build + +First, create the gradle wrapper script: + +``` +gradle wrapper +``` + +Then, run: + +``` +./gradlew check assemble +``` + +This runs all tests and packages the library. + +## Features/Implementation Notes + +* Supports JSON inputs/outputs, File inputs, and Form inputs. +* Supports collection formats for query parameters: csv, tsv, ssv, pipes. +* Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. +* Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. + + +## Documentation for API Endpoints + +All URIs are relative to *http://localhost:3000* + +| Class | Method | HTTP request | Description | +| ------------ | ------------- | ------------- | ------------- | +| *BodyApi* | [**testBodyMultipartFormdataWithJsonPart**](docs/BodyApi.md#testbodymultipartformdatawithjsonpart) | **POST** /body/multipart/formdata/with_json_part | Test multipart with JSON part | + + + +## Documentation for Models + + - [org.openapitools.client.models.FileMetadata](docs/FileMetadata.md) + + + +## Documentation for Authorization + +Endpoints do not require authorization. + diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/build.gradle b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/build.gradle new file mode 100644 index 000000000000..d8e895d8fe96 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/build.gradle @@ -0,0 +1,75 @@ +group 'org.openapitools' +version '1.0.0' + +wrapper { + gradleVersion = '8.14.3' + distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" +} + +buildscript { + ext.kotlin_version = '2.2.20' + ext.spotless_version = "7.2.1" + + repositories { + maven { url "https://repo1.maven.org/maven2" } + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotless_version" + } +} + +apply plugin: 'kotlin' +apply plugin: 'maven-publish' +apply plugin: 'com.diffplug.spotless' + +repositories { + maven { url "https://repo1.maven.org/maven2" } +} + +// Use spotless plugin to automatically format code, remove unused import, etc +// To apply changes directly to the file, run `gradlew spotlessApply` +// Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle +spotless { + // comment out below to run spotless as part of the `check` task + enforceCheck false + + format 'misc', { + // define the files (e.g. '*.gradle', '*.md') to apply `misc` to + target '.gitignore' + + // define the steps to apply to those files + trimTrailingWhitespace() + indentWithSpaces() // Takes an integer argument if you don't like 4 + endWithNewline() + } + kotlin { + ktfmt() + } +} + +test { + useJUnitPlatform() +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "com.google.code.gson:gson:2.13.2" + implementation "com.squareup.okhttp3:okhttp:5.1.0" + testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" +} + +java { + withSourcesJar() +} + +publishing { + publications { + maven(MavenPublication) { + groupId = 'org.openapitools' + artifactId = 'kotlin-client' + version = '1.0.0' + from components.java + } + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/docs/BodyApi.md b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/docs/BodyApi.md new file mode 100644 index 000000000000..4384296afe39 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/docs/BodyApi.md @@ -0,0 +1,57 @@ +# BodyApi + +All URIs are relative to *http://localhost:3000* + +| Method | HTTP request | Description | +| ------------- | ------------- | ------------- | +| [**testBodyMultipartFormdataWithJsonPart**](BodyApi.md#testBodyMultipartFormdataWithJsonPart) | **POST** /body/multipart/formdata/with_json_part | Test multipart with JSON part | + + + +# **testBodyMultipartFormdataWithJsonPart** +> kotlin.String testBodyMultipartFormdataWithJsonPart(metadata, file) + +Test multipart with JSON part + +Test multipart/form-data with a part that has Content-Type application/json + +### Example +```kotlin +// Import classes: +//import org.openapitools.client.infrastructure.* +//import org.openapitools.client.models.* + +val apiInstance = BodyApi() +val metadata : FileMetadata = // FileMetadata | +val file : java.io.File = BINARY_DATA_HERE // java.io.File | File to upload +try { + val result : kotlin.String = apiInstance.testBodyMultipartFormdataWithJsonPart(metadata, file) + println(result) +} catch (e: ClientException) { + println("4xx response calling BodyApi#testBodyMultipartFormdataWithJsonPart") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling BodyApi#testBodyMultipartFormdataWithJsonPart") + e.printStackTrace() +} +``` + +### Parameters +| **metadata** | [**FileMetadata**](FileMetadata.md)| | | +| Name | Type | Description | Notes | +| ------------- | ------------- | ------------- | ------------- | +| **file** | **java.io.File**| File to upload | | + +### Return type + +**kotlin.String** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: multipart/form-data + - **Accept**: text/plain + diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/docs/FileMetadata.md b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/docs/FileMetadata.md new file mode 100644 index 000000000000..115b2dfed517 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/docs/FileMetadata.md @@ -0,0 +1,12 @@ + +# FileMetadata + +## Properties +| Name | Type | Description | Notes | +| ------------ | ------------- | ------------- | ------------- | +| **id** | **kotlin.Long** | | | +| **name** | **kotlin.String** | | | +| **tags** | **kotlin.collections.List<kotlin.String>** | | [optional] | + + + diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradle/wrapper/gradle-wrapper.jar b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2c3521197d7c4586c843d1d3e9090525f1898cde GIT binary patch literal 43504 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) literal 0 HcmV?d00001 diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradle/wrapper/gradle-wrapper.properties b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000000..7705927e949f --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradlew b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradlew new file mode 100755 index 000000000000..51eb8bb47109 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while +APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path +[ -h "$app_path" ] +do +ls=$( ls -ld "$app_path" ) +link=${ls#*' -> '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { +echo "$*" +} >&2 + +die () { +echo +echo "$*" +echo +exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +else +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradlew.bat b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradlew.bat new file mode 100644 index 000000000000..9d21a21834d5 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/settings.gradle b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/settings.gradle new file mode 100644 index 000000000000..431927491c34 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'kotlin-client' diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/apis/BodyApi.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/apis/BodyApi.kt new file mode 100644 index 000000000000..6708ce68cee0 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/apis/BodyApi.kt @@ -0,0 +1,129 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.apis + +import java.io.IOException +import okhttp3.Call +import okhttp3.HttpUrl + +import org.openapitools.client.models.FileMetadata + +import com.google.gson.annotations.SerializedName + +import org.openapitools.client.infrastructure.ApiClient +import org.openapitools.client.infrastructure.ApiResponse +import org.openapitools.client.infrastructure.ClientException +import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.ServerException +import org.openapitools.client.infrastructure.ServerError +import org.openapitools.client.infrastructure.MultiValueMap +import org.openapitools.client.infrastructure.PartConfig +import org.openapitools.client.infrastructure.RequestConfig +import org.openapitools.client.infrastructure.RequestMethod +import org.openapitools.client.infrastructure.ResponseType +import org.openapitools.client.infrastructure.Success +import org.openapitools.client.infrastructure.toMultiValue + +open class BodyApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(ApiClient.baseUrlKey, "http://localhost:3000") + } + } + + /** + * POST /body/multipart/formdata/with_json_part + * Test multipart with JSON part + * Test multipart/form-data with a part that has Content-Type application/json + * @param metadata + * @param file File to upload + * @return kotlin.String + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun testBodyMultipartFormdataWithJsonPart(metadata: FileMetadata, file: java.io.File) : kotlin.String { + val localVarResponse = testBodyMultipartFormdataWithJsonPartWithHttpInfo(metadata = metadata, file = file) + + return when (localVarResponse.responseType) { + ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String + ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.") + ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.") + ResponseType.ClientError -> { + val localVarError = localVarResponse as ClientError<*> + throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse) + } + ResponseType.ServerError -> { + val localVarError = localVarResponse as ServerError<*> + throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse) + } + } + } + + /** + * POST /body/multipart/formdata/with_json_part + * Test multipart with JSON part + * Test multipart/form-data with a part that has Content-Type application/json + * @param metadata + * @param file File to upload + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun testBodyMultipartFormdataWithJsonPartWithHttpInfo(metadata: FileMetadata, file: java.io.File) : ApiResponse { + val localVariableConfig = testBodyMultipartFormdataWithJsonPartRequestConfig(metadata = metadata, file = file) + + return request>, kotlin.String>( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation testBodyMultipartFormdataWithJsonPart + * + * @param metadata + * @param file File to upload + * @return RequestConfig + */ + fun testBodyMultipartFormdataWithJsonPartRequestConfig(metadata: FileMetadata, file: java.io.File) : RequestConfig>> { + val localVariableBody = mapOf( + "metadata" to PartConfig(body = metadata, headers = mutableMapOf("Content-Type" to "application/json")), + "file" to PartConfig(body = file, headers = mutableMapOf("Content-Type" to "image/jpeg")),) + val localVariableQuery: MultiValueMap = mutableMapOf() + val localVariableHeaders: MutableMap = mutableMapOf("Content-Type" to "multipart/form-data") + localVariableHeaders["Accept"] = "text/plain" + + return RequestConfig( + method = RequestMethod.POST, + path = "/body/multipart/formdata/with_json_part", + query = localVariableQuery, + headers = localVariableHeaders, + requiresAuthentication = false, + body = localVariableBody + ) + } + + + private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String = + HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0] +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt new file mode 100644 index 000000000000..7fe8da468374 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt @@ -0,0 +1,23 @@ +package org.openapitools.client.infrastructure + +typealias MultiValueMap = MutableMap> + +fun collectionDelimiter(collectionFormat: String): String = when(collectionFormat) { + "csv" -> "," + "tsv" -> "\t" + "pipe" -> "|" + "space" -> " " + else -> "" +} + +val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" } + +fun toMultiValue(items: Array, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List + = toMultiValue(items.asIterable(), collectionFormat, map) + +fun toMultiValue(items: Iterable, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List { + return when(collectionFormat) { + "multi" -> items.map(map) + else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map)) + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt new file mode 100644 index 000000000000..e32a637b7496 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -0,0 +1,371 @@ +package org.openapitools.client.infrastructure + +import okhttp3.OkHttpClient +import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.asRequestBody +import okhttp3.RequestBody.Companion.toRequestBody +import okhttp3.FormBody +import okhttp3.HttpUrl.Companion.toHttpUrlOrNull +import okhttp3.ResponseBody +import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.Request +import okhttp3.Headers +import okhttp3.Headers.Builder +import okhttp3.Headers.Companion.toHeaders +import okhttp3.MultipartBody +import okhttp3.Call +import okhttp3.Callback +import okhttp3.Response +import java.io.BufferedWriter +import java.io.File +import java.io.FileWriter +import java.io.IOException +import java.net.URLConnection +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.OffsetDateTime +import java.time.OffsetTime +import java.util.Locale +import java.util.regex.Pattern +import com.google.gson.reflect.TypeToken + +val EMPTY_REQUEST: RequestBody = ByteArray(0).toRequestBody() + +open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClient) { + companion object { + protected const val ContentType: String = "Content-Type" + protected const val Accept: String = "Accept" + protected const val Authorization: String = "Authorization" + protected const val JsonMediaType: String = "application/json" + protected const val FormDataMediaType: String = "multipart/form-data" + protected const val FormUrlEncMediaType: String = "application/x-www-form-urlencoded" + protected const val XmlMediaType: String = "application/xml" + protected const val OctetMediaType: String = "application/octet-stream" + protected const val TextMediaType: String = "text/plain" + + val apiKey: MutableMap = mutableMapOf() + val apiKeyPrefix: MutableMap = mutableMapOf() + var username: String? = null + var password: String? = null + var accessToken: String? = null + const val baseUrlKey: String = "org.openapitools.client.baseUrl" + + @JvmStatic + val defaultClient: OkHttpClient by lazy { + builder.build() + } + + @JvmStatic + val builder: OkHttpClient.Builder = OkHttpClient.Builder() + } + + /** + * Guess Content-Type header from the given byteArray (defaults to "application/octet-stream"). + * + * @param byteArray The given file + * @return The guessed Content-Type + */ + protected fun guessContentTypeFromByteArray(byteArray: ByteArray): String { + val contentType = try { + URLConnection.guessContentTypeFromStream(byteArray.inputStream()) + } catch (io: IOException) { + "application/octet-stream" + } + return contentType + } + + /** + * Guess Content-Type header from the given file (defaults to "application/octet-stream"). + * + * @param file The given file + * @return The guessed Content-Type + */ + protected fun guessContentTypeFromFile(file: File): String { + val contentType = URLConnection.guessContentTypeFromName(file.name) + return contentType ?: "application/octet-stream" + } + + /** + * Adds a File to a MultipartBody.Builder + * Defined a helper in the requestBody method to not duplicate code + * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File + * + * @param name The field name to add in the request + * @param headers The headers that are in the PartConfig + * @param file The file that will be added as the field value + * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on + * @see requestBody + */ + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") + val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() + addPart( + partHeaders.toHeaders(), + file.asRequestBody(fileMediaType) + ) + } + + /** + * Adds any type to a MultipartBody.Builder + * Defined a helper in the requestBody method to not duplicate code + * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File. + * + * @param name The field name to add in the request + * @param headers The headers that are in the PartConfig + * @param obj The field name to add in the request + * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on + * @see requestBody + */ + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.gson.toJson(obj) + } else { + parameterToString(obj) + } + addPart( + partHeaders.toHeaders(), + partBody.toRequestBody(partMediaType) + ) + } + + protected inline fun requestBody(content: T, mediaType: String?): RequestBody = + when { + content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull()) + content is File -> content.asRequestBody((mediaType ?: guessContentTypeFromFile(content)).toMediaTypeOrNull()) + mediaType == FormDataMediaType -> + MultipartBody.Builder() + .setType(MultipartBody.FORM) + .apply { + // content's type *must* be Map> + @Suppress("UNCHECKED_CAST") + (content as Map>).forEach { (name, part) -> + when (part.body) { + is File -> addPartToMultiPart(name, part.headers, part.body) + is List<*> -> { + part.body.forEach { + if (it is File) { + addPartToMultiPart(name, part.headers, it) + } else { + addPartToMultiPart(name, part.headers, it) + } + } + } + else -> addPartToMultiPart(name, part.headers, part.body) + } + } + }.build() + mediaType == FormUrlEncMediaType -> { + FormBody.Builder().apply { + // content's type *must* be Map> + @Suppress("UNCHECKED_CAST") + (content as Map>).forEach { (name, part) -> + add(name, parameterToString(part.body)) + } + }.build() + } + mediaType == null || mediaType.startsWith("application/") && mediaType.endsWith("json") -> + if (content == null) { + EMPTY_REQUEST + } else { + Serializer.gson.toJson(content, T::class.java) + .toRequestBody((mediaType ?: JsonMediaType).toMediaTypeOrNull()) + } + mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.") + mediaType == TextMediaType && content is String -> + content.toRequestBody(TextMediaType.toMediaTypeOrNull()) + // TODO: this should be extended with other serializers + else -> throw UnsupportedOperationException("requestBody currently only supports JSON body, text body, byte body and File body.") + } + + protected inline fun responseBody(response: Response, mediaType: String? = JsonMediaType): T? { + val body = response.body + if(body == null) { + return null + } else if (T::class.java == Unit::class.java) { + // No need to parse the body when we're not interested in the body + // Useful when API is returning other Content-Type + return null + } else if (T::class.java == File::class.java) { + // return tempFile + val contentDisposition = response.header("Content-Disposition") + + val fileName = if (contentDisposition != null) { + // Get filename from the Content-Disposition header. + val pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?") + val matcher = pattern.matcher(contentDisposition) + if (matcher.find()) { + matcher.group(1) + ?.replace(".*[/\\\\]", "") + ?.replace(";", "") + } else { + null + } + } else { + null + } + + var prefix: String? + val suffix: String? + if (fileName == null) { + prefix = "download" + suffix = "" + } else { + val pos = fileName.lastIndexOf(".") + if (pos == -1) { + prefix = fileName + suffix = null + } else { + prefix = fileName.substring(0, pos) + suffix = fileName.substring(pos) + } + // Files.createTempFile requires the prefix to be at least three characters long + if (prefix.length < 3) { + prefix = "download" + } + } + + // Attention: if you are developing an android app that supports API Level 25 and below, please check flag supportAndroidApiLevel25AndBelow in https://openapi-generator.tech/docs/generators/kotlin#config-options + val tempFile = java.nio.file.Files.createTempFile(prefix, suffix).toFile() + tempFile.deleteOnExit() + body.byteStream().use { inputStream -> + tempFile.outputStream().use { tempFileOutputStream -> + inputStream.copyTo(tempFileOutputStream) + } + } + return tempFile as T + } + + return when { + mediaType == null || (mediaType.startsWith("application/") && mediaType.endsWith("json")) -> { + val bodyContent = body.string() + if (bodyContent.isEmpty()) { + return null + } + Serializer.gson.fromJson(bodyContent, (object: TypeToken(){}).getType()) + } + mediaType == OctetMediaType -> body.bytes() as? T + mediaType == TextMediaType -> body.string() as? T + else -> throw UnsupportedOperationException("responseBody currently only supports JSON body, text body and byte body.") + } + } + + + protected inline fun request(requestConfig: RequestConfig): ApiResponse { + val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.") + + val url = httpUrl.newBuilder() + .addEncodedPathSegments(requestConfig.path.trimStart('/')) + .apply { + requestConfig.query.forEach { query -> + query.value.forEach { queryValue -> + addQueryParameter(query.key, queryValue) + } + } + }.build() + + // take content-type/accept from spec or set to default (application/json) if not defined + if (requestConfig.body != null && requestConfig.headers[ContentType].isNullOrEmpty()) { + requestConfig.headers[ContentType] = JsonMediaType + } + if (requestConfig.headers[Accept].isNullOrEmpty()) { + requestConfig.headers[Accept] = JsonMediaType + } + val headers = requestConfig.headers + + if (headers[Accept].isNullOrEmpty()) { + throw kotlin.IllegalStateException("Missing Accept header. This is required.") + } + + val contentType = if (headers[ContentType] != null) { + // TODO: support multiple contentType options here. + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) + } else { + null + } + + val request = when (requestConfig.method) { + RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType)) + RequestMethod.GET -> Request.Builder().url(url) + RequestMethod.HEAD -> Request.Builder().url(url).head() + RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType)) + RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType)) + RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType)) + RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null) + }.apply { + val headersBuilder = Headers.Builder() + headers.forEach { header -> + headersBuilder.add(header.key, header.value) + } + this.headers(headersBuilder.build()) + }.build() + + val response = client.newCall(request).execute() + + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) + + // TODO: handle specific mapping types. e.g. Map> + @Suppress("UNNECESSARY_SAFE_CALL") + return response.use { + when { + it.isRedirect -> Redirection( + it.code, + it.headers.toMultimap() + ) + it.isInformational -> Informational( + it.message, + it.code, + it.headers.toMultimap() + ) + it.isSuccessful -> Success( + responseBody(it, accept), + it.code, + it.headers.toMultimap() + ) + it.isClientError -> ClientError( + it.message, + it.body?.string(), + it.code, + it.headers.toMultimap() + ) + else -> ServerError( + it.message, + it.body?.string(), + it.code, + it.headers.toMultimap() + ) + } + } + } + + protected fun parameterToString(value: Any?): String = when (value) { + null -> "" + is Array<*> -> toMultiValue(value, "csv").toString() + is Iterable<*> -> toMultiValue(value, "csv").toString() + is OffsetDateTime -> parseDateToQueryString(value) + is OffsetTime -> parseDateToQueryString(value) + is LocalDateTime -> parseDateToQueryString(value) + is LocalDate -> parseDateToQueryString(value) + is LocalTime -> parseDateToQueryString(value) + else -> value.toString() + } + + protected inline fun parseDateToQueryString(value : T): String { + /* + .replace("\"", "") converts the json object string to an actual string for the query parameter. + The moshi or gson adapter allows a more generic solution instead of trying to use a native + formatter. It also easily allows to provide a simple way to define a custom date format pattern + inside a gson/moshi adapter. + */ + return Serializer.gson.toJson(value, T::class.java).replace("\"", "") + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt new file mode 100644 index 000000000000..689fb03cd7ae --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt @@ -0,0 +1,43 @@ +package org.openapitools.client.infrastructure + +enum class ResponseType { + Success, Informational, Redirection, ClientError, ServerError +} + +interface Response + +abstract class ApiResponse(val responseType: ResponseType): Response { + abstract val statusCode: Int + abstract val headers: Map> +} + +class Success( + val data: T, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +): ApiResponse(ResponseType.Success) + +class Informational( + val statusText: String, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.Informational) + +class Redirection( + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.Redirection) + +class ClientError( + val message: String? = null, + val body: Any? = null, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.ClientError) + +class ServerError( + val message: String? = null, + val body: Any? = null, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +): ApiResponse(ResponseType.ServerError) diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt new file mode 100644 index 000000000000..6120b081929d --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt @@ -0,0 +1,33 @@ +package org.openapitools.client.infrastructure + +import com.google.gson.TypeAdapter +import com.google.gson.stream.JsonReader +import com.google.gson.stream.JsonWriter +import com.google.gson.stream.JsonToken.NULL +import java.io.IOException + +class ByteArrayAdapter : TypeAdapter() { + @Throws(IOException::class) + override fun write(out: JsonWriter?, value: ByteArray?) { + if (value == null) { + out?.nullValue() + } else { + out?.value(String(value)) + } + } + + @Throws(IOException::class) + override fun read(out: JsonReader?): ByteArray? { + out ?: return null + + when (out.peek()) { + NULL -> { + out.nextNull() + return null + } + else -> { + return out.nextString().toByteArray() + } + } + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt new file mode 100644 index 000000000000..c83993b9055c --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt @@ -0,0 +1,18 @@ +@file:Suppress("unused") +package org.openapitools.client.infrastructure + +import java.lang.RuntimeException + +open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) { + + companion object { + private const val serialVersionUID: Long = 123L + } +} + +open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) { + + companion object { + private const val serialVersionUID: Long = 456L + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt new file mode 100644 index 000000000000..30ef6697183a --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt @@ -0,0 +1,35 @@ +package org.openapitools.client.infrastructure + +import com.google.gson.TypeAdapter +import com.google.gson.stream.JsonReader +import com.google.gson.stream.JsonWriter +import com.google.gson.stream.JsonToken.NULL +import java.io.IOException +import java.time.LocalDate +import java.time.format.DateTimeFormatter + +class LocalDateAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE) : TypeAdapter() { + @Throws(IOException::class) + override fun write(out: JsonWriter?, value: LocalDate?) { + if (value == null) { + out?.nullValue() + } else { + out?.value(formatter.format(value)) + } + } + + @Throws(IOException::class) + override fun read(out: JsonReader?): LocalDate? { + out ?: return null + + when (out.peek()) { + NULL -> { + out.nextNull() + return null + } + else -> { + return LocalDate.parse(out.nextString(), formatter) + } + } + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt new file mode 100644 index 000000000000..3ad781c66ca1 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt @@ -0,0 +1,35 @@ +package org.openapitools.client.infrastructure + +import com.google.gson.TypeAdapter +import com.google.gson.stream.JsonReader +import com.google.gson.stream.JsonWriter +import com.google.gson.stream.JsonToken.NULL +import java.io.IOException +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter + +class LocalDateTimeAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME) : TypeAdapter() { + @Throws(IOException::class) + override fun write(out: JsonWriter?, value: LocalDateTime?) { + if (value == null) { + out?.nullValue() + } else { + out?.value(formatter.format(value)) + } + } + + @Throws(IOException::class) + override fun read(out: JsonReader?): LocalDateTime? { + out ?: return null + + when (out.peek()) { + NULL -> { + out.nextNull() + return null + } + else -> { + return LocalDateTime.parse(out.nextString(), formatter) + } + } + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt new file mode 100644 index 000000000000..e615135c9cc0 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt @@ -0,0 +1,35 @@ +package org.openapitools.client.infrastructure + +import com.google.gson.TypeAdapter +import com.google.gson.stream.JsonReader +import com.google.gson.stream.JsonWriter +import com.google.gson.stream.JsonToken.NULL +import java.io.IOException +import java.time.OffsetDateTime +import java.time.format.DateTimeFormatter + +class OffsetDateTimeAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME) : TypeAdapter() { + @Throws(IOException::class) + override fun write(out: JsonWriter?, value: OffsetDateTime?) { + if (value == null) { + out?.nullValue() + } else { + out?.value(formatter.format(value)) + } + } + + @Throws(IOException::class) + override fun read(out: JsonReader?): OffsetDateTime? { + out ?: return null + + when (out.peek()) { + NULL -> { + out.nextNull() + return null + } + else -> { + return OffsetDateTime.parse(out.nextString(), formatter) + } + } + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt new file mode 100644 index 000000000000..be00e38fbaee --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -0,0 +1,11 @@ +package org.openapitools.client.infrastructure + +/** + * Defines a config object for a given part of a multi-part request. + * NOTE: Headers is a Map because rfc2616 defines + * multi-valued headers as csv-only. + */ +data class PartConfig( + val headers: MutableMap = mutableMapOf(), + val body: T? = null +) diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt new file mode 100644 index 000000000000..6578b9381b78 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt @@ -0,0 +1,19 @@ +package org.openapitools.client.infrastructure + +/** + * Defines a config object for a given request. + * NOTE: This object doesn't include 'body' because it + * allows for caching of the constructed object + * for many request definitions. + * NOTE: Headers is a Map because rfc2616 defines + * multi-valued headers as csv-only. + */ +data class RequestConfig( + val method: RequestMethod, + val path: String, + val headers: MutableMap = mutableMapOf(), + val params: MutableMap = mutableMapOf(), + val query: MutableMap> = mutableMapOf(), + val requiresAuthentication: Boolean, + val body: T? = null +) diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt new file mode 100644 index 000000000000..beb56f07cdde --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt @@ -0,0 +1,8 @@ +package org.openapitools.client.infrastructure + +/** + * Provides enumerated HTTP verbs + */ +enum class RequestMethod { + GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt new file mode 100644 index 000000000000..9bd2790dc144 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt @@ -0,0 +1,24 @@ +package org.openapitools.client.infrastructure + +import okhttp3.Response + +/** + * Provides an extension to evaluation whether the response is a 1xx code + */ +val Response.isInformational : Boolean get() = this.code in 100..199 + +/** + * Provides an extension to evaluation whether the response is a 3xx code + */ +@Suppress("EXTENSION_SHADOWED_BY_MEMBER") +val Response.isRedirect : Boolean get() = this.code in 300..399 + +/** + * Provides an extension to evaluation whether the response is a 4xx code + */ +val Response.isClientError : Boolean get() = this.code in 400..499 + +/** + * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code + */ +val Response.isServerError : Boolean get() = this.code in 500..999 diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt new file mode 100644 index 000000000000..6e16e4f6582b --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -0,0 +1,22 @@ +package org.openapitools.client.infrastructure + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.OffsetDateTime +import java.util.UUID + +object Serializer { + @JvmStatic + val gsonBuilder: GsonBuilder = GsonBuilder() + .registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter()) + .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter()) + .registerTypeAdapter(LocalDate::class.java, LocalDateAdapter()) + .registerTypeAdapter(ByteArray::class.java, ByteArrayAdapter()) + + @JvmStatic + val gson: Gson by lazy { + gsonBuilder.create() + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/models/FileMetadata.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/models/FileMetadata.kt new file mode 100644 index 000000000000..13a4f8af4821 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/main/kotlin/org/openapitools/client/models/FileMetadata.kt @@ -0,0 +1,45 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.google.gson.annotations.SerializedName + +/** + * + * + * @param id + * @param name + * @param tags + */ + + +data class FileMetadata ( + + @SerializedName("id") + val id: kotlin.Long, + + @SerializedName("name") + val name: kotlin.String, + + @SerializedName("tags") + val tags: kotlin.collections.List? = null + +) { + + +} + diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/EchoServerResponseParser.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/EchoServerResponseParser.kt new file mode 100644 index 000000000000..fe0981d0e01f --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/EchoServerResponseParser.kt @@ -0,0 +1,44 @@ +package org.openapitools.client + +class EchoServerResponseParser(response: String) { + lateinit var method: String + lateinit var path: String + lateinit var protocol: String + val headers = hashMapOf() + val body: String + + init { + require(response.isNotEmpty()) { "Echo server response cannot be null" } + + val lines = response.lineSequence().iterator() + var firstLine = true + var bodyStart = false + val bodyBuilder = StringBuilder() + for (line in lines) { + if (firstLine) { + val items = line.split(" ") + method = items[0] + path = items[1] + protocol = items[2] + firstLine = false + continue + } + if (bodyStart) { + bodyBuilder.append(line) + bodyBuilder.append("\n") + } + if (line.isEmpty()) { + bodyStart = true + continue + } + + val keyValue = line.split(": ") + if (keyValue.size == 2) { + headers[keyValue[0]] = keyValue[1] + } + } + body = bodyBuilder.toString().trimEnd() + } +} + + diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/MultipartJsonTest.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/MultipartJsonTest.kt new file mode 100644 index 000000000000..5d42a6f6f4b5 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/MultipartJsonTest.kt @@ -0,0 +1,69 @@ +package org.openapitools.client + +import io.kotlintest.matchers.string.shouldContain +import io.kotlintest.matchers.string.shouldNotContain +import io.kotlintest.specs.ShouldSpec +import org.junit.jupiter.api.Assertions +import org.openapitools.client.apis.BodyApi +import org.openapitools.client.models.FileMetadata +import java.io.File +import java.io.FileWriter + +class MultipartJsonTest : ShouldSpec({ + val bodyApi = BodyApi() + + should("serialize JSON part with proper JSON format, not toString()") { + val metadata = FileMetadata( + id = 12345L, + name = "test-file", + tags = listOf("tag1", "tag2") + ) + val testFile = createTestFile() + + val result = bodyApi.testBodyMultipartFormdataWithJsonPart(metadata, testFile) + val parsedResult = EchoServerResponseParser(result) + + // The metadata part should contain proper JSON serialization + parsedResult.body shouldContain """"id":12345""" + parsedResult.body shouldContain """"name":"test-file"""" + parsedResult.body shouldContain """"tags":["tag1","tag2"]""" + + // Should NOT contain Kotlin's toString() format like "FileMetadata(id=12345, name=test-file)" + parsedResult.body shouldNotContain "FileMetadata(" + + // Should have proper Content-Type for metadata part + parsedResult.body shouldContain """Content-Type: application/json""" + + // File part should be present + parsedResult.body shouldContain """Content-Disposition: form-data; name="file"; filename="test.txt"""" + parsedResult.body shouldContain """testing multipart with json""" + } + + should("not throw IllegalArgumentException for Content-Type in headers") { + // This test verifies that Content-Type is properly filtered from headers + // and passed to OkHttp's asRequestBody/toRequestBody methods instead + val metadata = FileMetadata( + id = 999L, + name = "another-test" + ) + val testFile = createTestFile() + + // Should not throw: java.lang.IllegalArgumentException: Unexpected header: Content-Type + val result = bodyApi.testBodyMultipartFormdataWithJsonPart(metadata, testFile) + + // If we get here without exception, the fix is working + Assertions.assertNotNull(result) + } +}) + +private fun createTestFile(): File { + val myFile = File("test.txt") + if (!myFile.exists()) { + Assertions.assertTrue(myFile.createNewFile()) + } + val fw = FileWriter(myFile) + fw.write("testing multipart with json") + fw.close() + myFile.deleteOnExit() + return myFile +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/apis/BodyApiTest.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/apis/BodyApiTest.kt new file mode 100644 index 000000000000..ddcb787b4322 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/apis/BodyApiTest.kt @@ -0,0 +1,39 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.apis + +import io.kotlintest.shouldBe +import io.kotlintest.specs.ShouldSpec + +import org.openapitools.client.apis.BodyApi +import org.openapitools.client.models.FileMetadata + +class BodyApiTest : ShouldSpec() { + init { + // uncomment below to create an instance of BodyApi + //val apiInstance = BodyApi() + + // to test testBodyMultipartFormdataWithJsonPart + should("test testBodyMultipartFormdataWithJsonPart") { + // uncomment below to test testBodyMultipartFormdataWithJsonPart + //val metadata : FileMetadata = // FileMetadata | + //val file : java.io.File = BINARY_DATA_HERE // java.io.File | File to upload + //val result : kotlin.String = apiInstance.testBodyMultipartFormdataWithJsonPart(metadata, file) + //result shouldBe ("TODO") + } + + } +} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/models/FileMetadataTest.kt b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/models/FileMetadataTest.kt new file mode 100644 index 000000000000..e441b43c8800 --- /dev/null +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/src/test/kotlin/org/openapitools/client/models/FileMetadataTest.kt @@ -0,0 +1,47 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + +import io.kotlintest.shouldBe +import io.kotlintest.specs.ShouldSpec + +import org.openapitools.client.models.FileMetadata + +class FileMetadataTest : ShouldSpec() { + init { + // uncomment below to create an instance of FileMetadata + //val modelInstance = FileMetadata() + + // to test the property `id` + should("test id") { + // uncomment below to test the property + //modelInstance.id shouldBe ("TODO") + } + + // to test the property `name` + should("test name") { + // uncomment below to test the property + //modelInstance.name shouldBe ("TODO") + } + + // to test the property `tags` + should("test tags") { + // uncomment below to test the property + //modelInstance.tags shouldBe ("TODO") + } + + } +} From 4e1607ed4d03e15cdb1d76024010635a5f4dc8fb Mon Sep 17 00:00:00 2001 From: Alex Humphreys Date: Fri, 30 Jan 2026 20:40:49 +0100 Subject: [PATCH 2/6] Run mvn clean/package, and regenerate samples --- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- .../client/infrastructure/ApiClient.kt | 17 ++++++++++++++--- 27 files changed, 378 insertions(+), 81 deletions(-) diff --git a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c681bff3ed9e..a676ac04553a 100644 --- a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 7b323e0bb54c..7105ed35bd5a 100644 --- a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index d8aff9820512..4c6f7a634821 100644 --- a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 64f8281e060a..3f9fa92db76d 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -99,7 +99,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -120,11 +122,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.kotlinxSerializationJson.encodeToString(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index d8ca8529f445..ce9ab5a14c14 100644 --- a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b82045dcf7c9..b45814f5be16 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.gson.toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index a9557faaeea0..e97c7d262517 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.jacksonObjectMapper.writeValueAsString(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index ac1275ddf499..79c3329b81fe 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -100,7 +100,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -121,11 +123,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.kotlinxSerializationJson.encodeToString(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 673be9e32774..a5495a0ff8bc 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -101,7 +101,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -122,11 +124,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.gson.toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b650bfc5f8fc..149ee4db2654 100644 --- a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b650bfc5f8fc..149ee4db2654 100644 --- a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b650bfc5f8fc..149ee4db2654 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 14546d820360..4719fdaeb1e9 100644 --- a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c88b2656e4ec..521487f499c2 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b650bfc5f8fc..149ee4db2654 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b650bfc5f8fc..149ee4db2654 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 6bc994077211..90476d63a9bf 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 64f8281e060a..3f9fa92db76d 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -99,7 +99,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -120,11 +122,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.kotlinxSerializationJson.encodeToString(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b650bfc5f8fc..149ee4db2654 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -98,7 +98,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - val partHeaders = headers.toMutableMap() + + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via asRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( @@ -119,11 +121,20 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partHeaders = headers.toMutableMap() + + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = if (partContentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } addPart( partHeaders.toHeaders(), - parameterToString(obj).toRequestBody(null) + partBody.toRequestBody(partMediaType) ) } From 298e7bb77ceadf436ff4cba50c928a76830279ac Mon Sep 17 00:00:00 2001 From: Alex Humphreys Date: Sat, 31 Jan 2026 23:57:03 +0100 Subject: [PATCH 3/6] Add fix for kotlinx serialisation issue --- .../infrastructure/ApiClient.kt.mustache | 44 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- .../client/infrastructure/ApiClient.kt | 22 +++++++--- 28 files changed, 487 insertions(+), 151 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache index 5b885ba971b5..e4419a8f681d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache @@ -139,24 +139,15 @@ import com.squareup.moshi.adapter } /** - * Adds any type to a MultipartBody.Builder - * Defined a helper in the requestBody method to not duplicate code - * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File. + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. * - * @param name The field name to add in the request - * @param headers The headers that are in the PartConfig - * @param obj The field name to add in the request - * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on - * @see requestBody + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { - val partContentType = headers["Content-Type"] - val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { {{#moshi}} Serializer.moshi.adapter(Any::class.java).toJson(obj) {{/moshi}} @@ -172,6 +163,27 @@ import com.squareup.moshi.adapter } else { parameterToString(obj) } + } + + /** + * Adds any type to a MultipartBody.Builder + * Defined a helper in the requestBody method to not duplicate code + * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File. + * + * @param name The field name to add in the request + * @param headers The headers that are in the PartConfig + * @param obj The field name to add in the request + * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on + * @see requestBody + */ + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + val partContentType = headers["Content-Type"] + val partMediaType = partContentType?.toMediaTypeOrNull() + // Filter out Content-Type from headers as OkHttp requires it to be passed + // separately via toRequestBody(mediaType), not in the headers map + val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"") + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index a676ac04553a..99337656e6bf 100644 --- a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 7105ed35bd5a..5d0cabecec32 100644 --- a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4c6f7a634821..5da9c63344a9 100644 --- a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3f9fa92db76d..896d019c3a8a 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -110,6 +110,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.kotlinxSerializationJson.encodeToString(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -128,11 +144,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.kotlinxSerializationJson.encodeToString(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index ce9ab5a14c14..7498cae6b7d5 100644 --- a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b45814f5be16..cae95f01a612 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.gson.toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.gson.toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index e97c7d262517..9e4bbc4c3bab 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.jacksonObjectMapper.writeValueAsString(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.jacksonObjectMapper.writeValueAsString(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 79c3329b81fe..ea4de56be6be 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -111,6 +111,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.kotlinxSerializationJson.encodeToString(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -129,11 +145,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.kotlinxSerializationJson.encodeToString(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index a5495a0ff8bc..f9c4c95c8108 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -112,6 +112,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.gson.toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -130,11 +146,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.gson.toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 149ee4db2654..c2e05741a031 100644 --- a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 149ee4db2654..c2e05741a031 100644 --- a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 149ee4db2654..c2e05741a031 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 4719fdaeb1e9..bd47f2884c2d 100644 --- a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 521487f499c2..ecceb112c740 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 149ee4db2654..c2e05741a031 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 149ee4db2654..c2e05741a031 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 90476d63a9bf..3a3bedb8aa69 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3f9fa92db76d..896d019c3a8a 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -110,6 +110,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.kotlinxSerializationJson.encodeToString(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -128,11 +144,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.kotlinxSerializationJson.encodeToString(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 149ee4db2654..c2e05741a031 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -109,6 +109,22 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie ) } + /** + * Serializes a multipart body part based on its content type. + * Uses JSON serialization for application/json content types, otherwise converts to string. + * + * @param obj The object to serialize + * @param contentType The Content-Type header value, if any + * @return The serialized string representation + */ + protected inline fun serializePartBody(obj: T?, contentType: String?): String { + return if (contentType?.contains("json") == true) { + Serializer.moshi.adapter(Any::class.java).toJson(obj) + } else { + parameterToString(obj) + } + } + /** * Adds any type to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,11 +143,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie // separately via toRequestBody(mediaType), not in the headers map val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + ("Content-Disposition" to "form-data; name=\"$name\"") - val partBody = if (partContentType?.contains("json") == true) { - Serializer.moshi.adapter(Any::class.java).toJson(obj) - } else { - parameterToString(obj) - } + val partBody = serializePartBody(obj, partContentType) addPart( partHeaders.toHeaders(), partBody.toRequestBody(partMediaType) From af29043603eccf5133964c6ad9dffa6bc14419ac Mon Sep 17 00:00:00 2001 From: Alex Humphreys Date: Sun, 1 Feb 2026 10:06:16 +0100 Subject: [PATCH 4/6] Refactor multipart helpers for reified type parameter support --- .../infrastructure/ApiClient.kt.mustache | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- .../client/infrastructure/ApiClient.kt | 33 ++++++++++++------- 28 files changed, 616 insertions(+), 308 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache index e4419a8f681d..8a3576d4520a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache @@ -115,6 +115,25 @@ import com.squareup.moshi.adapter return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -127,13 +146,9 @@ import com.squareup.moshi.adapter * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -176,16 +191,12 @@ import com.squareup.moshi.adapter * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 99337656e6bf..fc810bed6cbe 100644 --- a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 5d0cabecec32..40bd70cea455 100644 --- a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 5da9c63344a9..ec98e392b1ee 100644 --- a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 896d019c3a8a..484931a33c24 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -87,6 +87,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -99,13 +118,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -137,16 +152,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 7498cae6b7d5..821976398d40 100644 --- a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index cae95f01a612..dceb50aaa3f8 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 9e4bbc4c3bab..2e28fdf1b327 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index ea4de56be6be..1bd95087ff55 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -88,6 +88,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -100,13 +119,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -138,16 +153,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index f9c4c95c8108..1aad91a37a90 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -89,6 +89,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -101,13 +120,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -139,16 +154,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c2e05741a031..03c05a7d71fc 100644 --- a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c2e05741a031..03c05a7d71fc 100644 --- a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c2e05741a031..03c05a7d71fc 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index bd47f2884c2d..3845ce8b5aac 100644 --- a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index ecceb112c740..c0a7eed8556f 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c2e05741a031..03c05a7d71fc 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c2e05741a031..03c05a7d71fc 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3a3bedb8aa69..a02c9f5ef22e 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 896d019c3a8a..484931a33c24 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -87,6 +87,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -99,13 +118,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -137,16 +152,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c2e05741a031..03c05a7d71fc 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -86,6 +86,25 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie return contentType ?: "application/octet-stream" } + /** + * Builds headers for a multipart form-data part. + * OkHttp requires Content-Type to be passed via the RequestBody parameter, not in headers. + * This function filters out Content-Type and builds the appropriate Content-Disposition header. + * + * @param name The field name + * @param headers The headers from the PartConfig (may include Content-Type) + * @param filename Optional filename for file uploads + * @return Headers object ready for addPart() + */ + protected fun buildPartHeaders(name: String, headers: Map, filename: String? = null): Headers { + val disposition = if (filename != null) { + "form-data; name=\"$name\"; filename=\"$filename\"" + } else { + "form-data; name=\"$name\"" + } + return (headers.filterKeys { it != "Content-Type" } + ("Content-Disposition" to disposition)).toHeaders() + } + /** * Adds a File to a MultipartBody.Builder * Defined a helper in the requestBody method to not duplicate code @@ -98,13 +117,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @see requestBody */ protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, file: File) { - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via asRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"") val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull() addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers, file.name), file.asRequestBody(fileMediaType) ) } @@ -136,16 +151,12 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - // Filter out Content-Type from headers as OkHttp requires it to be passed - // separately via toRequestBody(mediaType), not in the headers map - val partHeaders = headers.filterKeys { it != "Content-Type" }.toMutableMap() + - ("Content-Disposition" to "form-data; name=\"$name\"") val partBody = serializePartBody(obj, partContentType) addPart( - partHeaders.toHeaders(), + buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) ) } From c58de051fbe3418a07e2476d0b2a90eb31fcb9ab Mon Sep 17 00:00:00 2001 From: Alex Humphreys Date: Sun, 1 Feb 2026 12:02:25 +0100 Subject: [PATCH 5/6] Fix kotlinx.serialization multipart by adding serializer lambda to PartConfig --- .gitignore | 1 + .../infrastructure/PartConfig.kt.mustache | 10 ++- .../libraries/jvm-okhttp/api.mustache | 5 +- .../infrastructure/ApiClient.kt.mustache | 21 +++-- .../resources/3_0/kotlin/polymorphism.yaml | 29 +++++++ .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../README.md | 1 + .../docs/BirdApi.md | 47 +++++++++++ .../org/openapitools/client/apis/BirdApi.kt | 79 +++++++++++++++++++ .../client/infrastructure/ApiClient.kt | 21 +++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../MultipartJsonSerializationTest.kt | 34 ++++++++ .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../gradlew | 0 .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../org/openapitools/client/apis/PetApi.kt | 1 + .../org/openapitools/client/apis/StoreApi.kt | 1 + .../org/openapitools/client/apis/UserApi.kt | 1 + .../client/infrastructure/ApiClient.kt | 21 +++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../README.md | 1 + .../docs/BirdApi.md | 47 +++++++++++ .../org/openapitools/client/apis/BirdApi.kt | 37 +++++++++ .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../org/openapitools/client/apis/EnumApi.kt | 1 + .../client/infrastructure/ApiClient.kt | 21 +++-- .../client/infrastructure/PartConfig.kt | 10 ++- .../client/infrastructure/ApiClient.kt | 17 ++-- .../client/infrastructure/PartConfig.kt | 10 ++- 82 files changed, 983 insertions(+), 184 deletions(-) create mode 100644 samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/infrastructure/MultipartJsonSerializationTest.kt mode change 100644 => 100755 samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/gradlew diff --git a/.gitignore b/.gitignore index b08a0113f7c7..a11c07212928 100644 --- a/.gitignore +++ b/.gitignore @@ -229,6 +229,7 @@ samples/client/petstore/kotlin*/src/main/kotlin/test/ samples/client/petstore/kotlin*/build/ samples/server/others/kotlin-server/jaxrs-spec/build/ samples/client/echo_api/kotlin-jvm-spring-3-restclient/build/ +samples/client/echo_api/kotlin-jvm-spring-3-webclient/build/ samples/client/echo_api/kotlin-jvm-okhttp/build/ samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/build/ diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache index 36c970b7f7ca..d802810551a3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache @@ -4,8 +4,16 @@ package {{packageName}}.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache index 669dd54ee00e..8c2213e586f9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache @@ -46,6 +46,9 @@ import {{packageName}}.infrastructure.RequestMethod import {{packageName}}.infrastructure.ResponseType import {{packageName}}.infrastructure.Success import {{packageName}}.infrastructure.toMultiValue +{{#kotlinx_serialization}} +import {{packageName}}.infrastructure.Serializer +{{/kotlinx_serialization}} {{#operations}} {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}open {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) { @@ -199,7 +202,7 @@ import {{packageName}}.infrastructure.toMultiValue }}{{#bodyParams}}{{{paramName}}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{! }}{{^hasFormParams}}null{{/hasFormParams}}{{! }}{{#hasFormParams}}mapOf({{#formParams}} - "{{#lambda.escapeDollar}}{{{baseName}}}{{/lambda.escapeDollar}}" to PartConfig(body = {{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}, headers = mutableMapOf({{#contentType}}"Content-Type" to "{{contentType}}"{{/contentType}})),{{! + "{{#lambda.escapeDollar}}{{{baseName}}}{{/lambda.escapeDollar}}" to PartConfig(body = {{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}, headers = mutableMapOf({{#contentType}}"Content-Type" to "{{contentType}}"{{/contentType}}){{#contentType}}{{^isFile}}, serializer = {{#kotlinx_serialization}}{ obj -> Serializer.kotlinxSerializationJson.encodeToString<{{{dataType}}}>(obj as {{{dataType}}}) }{{/kotlinx_serialization}}{{^kotlinx_serialization}}null{{/kotlinx_serialization}}{{/isFile}}{{/contentType}}),{{! }}{{/formParams}}){{/hasFormParams}}{{! }}{{/hasBodyParam}} val localVariableQuery: MultiValueMap = {{^hasQueryParams}}mutableMapOf() diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache index 8a3576d4520a..2faa8be0068c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache @@ -159,9 +159,15 @@ import com.squareup.moshi.adapter * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { {{#moshi}} Serializer.moshi.adapter(Any::class.java).toJson(obj) @@ -173,7 +179,9 @@ import com.squareup.moshi.adapter Serializer.jacksonObjectMapper.writeValueAsString(obj) {{/jackson}} {{#kotlinx_serialization}} - Serializer.kotlinxSerializationJson.encodeToString(obj) + // Note: Without a custom serializer, kotlinx.serialization cannot serialize Any? + // The custom serializer should be provided at PartConfig creation to capture type info + parameterToString(obj) {{/kotlinx_serialization}} } else { parameterToString(obj) @@ -188,13 +196,14 @@ import com.squareup.moshi.adapter * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -219,11 +228,11 @@ import com.squareup.moshi.adapter if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism.yaml index 92cd1539bd1a..35fe2b1365f0 100644 --- a/modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism.yaml @@ -30,6 +30,35 @@ paths: name: id in: path required: true + '/v1/bird/upload': + post: + tags: + - bird + operationId: upload-bird-with-metadata + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + metadata: + $ref: '#/components/schemas/bird' + file: + type: string + format: binary + required: + - metadata + - file + encoding: + metadata: + contentType: application/json + responses: + '200': + description: Upload successful + content: + text/plain: + schema: + type: string components: schemas: animal: diff --git a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index fc810bed6cbe..53456dc6d566 100644 --- a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 40bd70cea455..2ddfd72c32c2 100644 --- a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index ec98e392b1ee..3b5b923b5a27 100644 --- a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/README.md b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/README.md index 9e7c9dfd8d50..e8adfecabfc3 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/README.md +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/README.md @@ -47,6 +47,7 @@ All URIs are relative to *http://example.org* | Class | Method | HTTP request | Description | | ------------ | ------------- | ------------- | ------------- | | *BirdApi* | [**getBird**](docs/BirdApi.md#getbird) | **GET** /v1/bird/{id} | | +| *BirdApi* | [**uploadBirdWithMetadata**](docs/BirdApi.md#uploadbirdwithmetadata) | **POST** /v1/bird/upload | | diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/BirdApi.md b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/BirdApi.md index 60283e9b7cd3..4422300d940d 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/BirdApi.md +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/BirdApi.md @@ -5,6 +5,7 @@ All URIs are relative to *http://example.org* | Method | HTTP request | Description | | ------------- | ------------- | ------------- | | [**getBird**](BirdApi.md#getBird) | **GET** /v1/bird/{id} | | +| [**uploadBirdWithMetadata**](BirdApi.md#uploadBirdWithMetadata) | **POST** /v1/bird/upload | | @@ -51,3 +52,49 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/json + +# **uploadBirdWithMetadata** +> kotlin.String uploadBirdWithMetadata(metadata, file) + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.client.infrastructure.* +//import org.openapitools.client.models.* + +val apiInstance = BirdApi() +val metadata : Bird = // Bird | +val file : java.io.File = BINARY_DATA_HERE // java.io.File | +try { + val result : kotlin.String = apiInstance.uploadBirdWithMetadata(metadata, file) + println(result) +} catch (e: ClientException) { + println("4xx response calling BirdApi#uploadBirdWithMetadata") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling BirdApi#uploadBirdWithMetadata") + e.printStackTrace() +} +``` + +### Parameters +| **metadata** | [**Bird**](Bird.md)| | | +| Name | Type | Description | Notes | +| ------------- | ------------- | ------------- | ------------- | +| **file** | **java.io.File**| | | + +### Return type + +**kotlin.String** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: multipart/form-data + - **Accept**: text/plain + diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt index 9d2a51531fe2..b12852467001 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt @@ -37,6 +37,7 @@ import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue +import org.openapitools.client.infrastructure.Serializer open class BirdApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { @@ -119,6 +120,84 @@ open class BirdApi(basePath: kotlin.String = defaultBasePath, client: Call.Facto ) } + /** + * POST /v1/bird/upload + * + * + * @param metadata + * @param file + * @return kotlin.String + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun uploadBirdWithMetadata(metadata: Bird, file: java.io.File) : kotlin.String { + val localVarResponse = uploadBirdWithMetadataWithHttpInfo(metadata = metadata, file = file) + + return when (localVarResponse.responseType) { + ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String + ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.") + ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.") + ResponseType.ClientError -> { + val localVarError = localVarResponse as ClientError<*> + throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse) + } + ResponseType.ServerError -> { + val localVarError = localVarResponse as ServerError<*> + throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse) + } + } + } + + /** + * POST /v1/bird/upload + * + * + * @param metadata + * @param file + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun uploadBirdWithMetadataWithHttpInfo(metadata: Bird, file: java.io.File) : ApiResponse { + val localVariableConfig = uploadBirdWithMetadataRequestConfig(metadata = metadata, file = file) + + return request>, kotlin.String>( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation uploadBirdWithMetadata + * + * @param metadata + * @param file + * @return RequestConfig + */ + fun uploadBirdWithMetadataRequestConfig(metadata: Bird, file: java.io.File) : RequestConfig>> { + val localVariableBody = mapOf( + "metadata" to PartConfig(body = metadata, headers = mutableMapOf("Content-Type" to "application/json"), serializer = { obj -> Serializer.kotlinxSerializationJson.encodeToString(obj as Bird) }), + "file" to PartConfig(body = file, headers = mutableMapOf()),) + val localVariableQuery: MultiValueMap = mutableMapOf() + val localVariableHeaders: MutableMap = mutableMapOf("Content-Type" to "multipart/form-data") + localVariableHeaders["Accept"] = "text/plain" + + return RequestConfig( + method = RequestMethod.POST, + path = "/v1/bird/upload", + query = localVariableQuery, + headers = localVariableHeaders, + requiresAuthentication = false, + body = localVariableBody + ) + } + private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String = HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0] diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 484931a33c24..82abe8c6e784 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -131,11 +131,19 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { - Serializer.kotlinxSerializationJson.encodeToString(obj) + // Note: Without a custom serializer, kotlinx.serialization cannot serialize Any? + // The custom serializer should be provided at PartConfig creation to capture type info + parameterToString(obj) } else { parameterToString(obj) } @@ -149,13 +157,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -180,11 +189,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/infrastructure/MultipartJsonSerializationTest.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/infrastructure/MultipartJsonSerializationTest.kt new file mode 100644 index 000000000000..fe275fdafc7f --- /dev/null +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/infrastructure/MultipartJsonSerializationTest.kt @@ -0,0 +1,34 @@ +package org.openapitools.client.infrastructure + +import io.kotlintest.shouldNotThrow +import io.kotlintest.specs.ShouldSpec +import org.openapitools.client.apis.BirdApi +import org.openapitools.client.models.Bird +import java.io.File +import java.math.BigDecimal +import java.util.UUID + +class MultipartJsonSerializationTest : ShouldSpec({ + should("serialize Bird model in multipart without SerializationException") { + val bird = Bird( + id = UUID.randomUUID(), + featherType = "fluffy", + optionalProperty = BigDecimal("42.0") + ) + + // Create a test file + val testFile = File.createTempFile("test", ".txt") + testFile.writeText("test content") + testFile.deleteOnExit() + + val birdApi = BirdApi("http://example.org") + + // This should NOT throw SerializationException + // The generated code creates a PartConfig with a serializer lambda that captures the Bird type + // Before this fix, kotlinx.serialization would fail with "Cannot serialize Any?" + shouldNotThrow { + // We build the RequestConfig which creates PartConfig with the serializer + birdApi.uploadBirdWithMetadataRequestConfig(metadata = bird, file = testFile) + } + } +}) diff --git a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-array-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/gradlew b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/gradlew old mode 100644 new mode 100755 diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 821976398d40..27b2d0a1d647 100644 --- a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ public open class ApiClient(public val baseUrl: String, public val client: Call. if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index 474ed67f4002..a9d46bf6c53a 100644 --- a/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ public data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index dceb50aaa3f8..e4d1d2ec2b5b 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.gson.toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 2e28fdf1b327..81368b73d125 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.jacksonObjectMapper.writeValueAsString(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0641a3a45a0b..8a466b82b9bc 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -38,6 +38,7 @@ import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue +import org.openapitools.client.infrastructure.Serializer open class PetApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 60177faadaa0..8aac14de6e43 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -37,6 +37,7 @@ import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue +import org.openapitools.client.infrastructure.Serializer open class StoreApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b71f8d39d9bd..9fb061238832 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -37,6 +37,7 @@ import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue +import org.openapitools.client.infrastructure.Serializer open class UserApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 1bd95087ff55..3b8c498e110b 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -132,11 +132,19 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { - Serializer.kotlinxSerializationJson.encodeToString(obj) + // Note: Without a custom serializer, kotlinx.serialization cannot serialize Any? + // The custom serializer should be provided at PartConfig creation to capture type info + parameterToString(obj) } else { parameterToString(obj) } @@ -150,13 +158,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -181,11 +190,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 1aad91a37a90..104be9ffad7c 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -133,9 +133,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.gson.toJson(obj) } else { @@ -151,13 +157,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -182,11 +189,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 03c05a7d71fc..24ba4d333f1b 100644 --- a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 03c05a7d71fc..24ba4d333f1b 100644 --- a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 03c05a7d71fc..24ba4d333f1b 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/README.md b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/README.md index 0631d896030a..390cabcc4d33 100644 --- a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/README.md +++ b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/README.md @@ -38,6 +38,7 @@ All URIs are relative to *http://example.org* | Class | Method | HTTP request | Description | | ------------ | ------------- | ------------- | ------------- | | *BirdApi* | [**getBird**](docs/BirdApi.md#getbird) | **GET** /v1/bird/{id} | | +| *BirdApi* | [**uploadBirdWithMetadata**](docs/BirdApi.md#uploadbirdwithmetadata) | **POST** /v1/bird/upload | | diff --git a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/docs/BirdApi.md b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/docs/BirdApi.md index 9eea072053dd..af920447b8c4 100644 --- a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/docs/BirdApi.md +++ b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/docs/BirdApi.md @@ -5,6 +5,7 @@ All URIs are relative to *http://example.org* | Method | HTTP request | Description | | ------------- | ------------- | ------------- | | [**getBird**](BirdApi.md#getBird) | **GET** /v1/bird/{id} | | +| [**uploadBirdWithMetadata**](BirdApi.md#uploadBirdWithMetadata) | **POST** /v1/bird/upload | | @@ -51,3 +52,49 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/json + +# **uploadBirdWithMetadata** +> kotlin.String uploadBirdWithMetadata(metadata, file) + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.client.infrastructure.* +//import org.openapitools.client.models.* + +val apiInstance = BirdApi() +val metadata : Bird = // Bird | +val file : io.ktor.client.request.forms.FormPart = BINARY_DATA_HERE // io.ktor.client.request.forms.FormPart | +try { + val result : kotlin.String = apiInstance.uploadBirdWithMetadata(metadata, file) + println(result) +} catch (e: ClientException) { + println("4xx response calling BirdApi#uploadBirdWithMetadata") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling BirdApi#uploadBirdWithMetadata") + e.printStackTrace() +} +``` + +### Parameters +| **metadata** | [**Bird**](Bird.md)| | | +| Name | Type | Description | Notes | +| ------------- | ------------- | ------------- | ------------- | +| **file** | **io.ktor.client.request.forms.FormPart<io.ktor.client.request.forms.InputProvider>**| | | + +### Return type + +**kotlin.String** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: multipart/form-data + - **Accept**: text/plain + diff --git a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/apis/BirdApi.kt b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/apis/BirdApi.kt index c1549d83216d..b315d30a328e 100644 --- a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/apis/BirdApi.kt +++ b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/apis/BirdApi.kt @@ -75,4 +75,41 @@ open class BirdApi : ApiClient { } + /** + * + * + * @param metadata + * @param file + * @return kotlin.String + */ + @Suppress("UNCHECKED_CAST") + open suspend fun uploadBirdWithMetadata(metadata: Bird, file: io.ktor.client.request.forms.FormPart): HttpResponse { + + val localVariableAuthNames = listOf() + + val localVariableBody = + formData { + metadata?.apply { append("metadata", metadata) } + file?.apply { append(file) } + } + + val localVariableQuery = mutableMapOf>() + val localVariableHeaders = mutableMapOf() + + val localVariableConfig = RequestConfig( + RequestMethod.POST, + "/v1/bird/upload", + query = localVariableQuery, + headers = localVariableHeaders, + requiresAuthentication = false, + ) + + return multipartFormRequest( + localVariableConfig, + localVariableBody, + localVariableAuthNames + ).wrap() + } + + } diff --git a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3845ce8b5aac..608a208cac4a 100644 --- a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c0a7eed8556f..8ed3a3eb901a 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index 2da623bb7079..d67639eef27f 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ internal data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 03c05a7d71fc..24ba4d333f1b 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 03c05a7d71fc..24ba4d333f1b 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index a02c9f5ef22e..560d92783571 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt index 82a64bcca37c..2cd6c8d9af19 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt @@ -37,6 +37,7 @@ import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue +import org.openapitools.client.infrastructure.Serializer open class EnumApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 484931a33c24..82abe8c6e784 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -131,11 +131,19 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { - Serializer.kotlinxSerializationJson.encodeToString(obj) + // Note: Without a custom serializer, kotlinx.serialization cannot serialize Any? + // The custom serializer should be provided at PartConfig creation to capture type info + parameterToString(obj) } else { parameterToString(obj) } @@ -149,13 +157,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -180,11 +189,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 03c05a7d71fc..24ba4d333f1b 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -130,9 +130,15 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * * @param obj The object to serialize * @param contentType The Content-Type header value, if any + * @param serializer Optional custom serializer (used for kotlinx.serialization to preserve type info) * @return The serialized string representation */ - protected inline fun serializePartBody(obj: T?, contentType: String?): String { + protected fun serializePartBody(obj: Any?, contentType: String?, serializer: ((Any?) -> String)?): String { + // Use custom serializer if provided (for kotlinx.serialization with captured type info) + if (serializer != null) { + return serializer(obj) + } + return if (contentType?.contains("json") == true) { Serializer.moshi.adapter(Any::class.java).toJson(obj) } else { @@ -148,13 +154,14 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie * @param name The field name to add in the request * @param headers The headers that are in the PartConfig * @param obj The field name to add in the request + * @param serializer Optional custom serializer for this part * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on * @see requestBody */ - protected inline fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: T?) { + protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map, obj: Any?, serializer: ((Any?) -> String)? = null) { val partContentType = headers["Content-Type"] val partMediaType = partContentType?.toMediaTypeOrNull() - val partBody = serializePartBody(obj, partContentType) + val partBody = serializePartBody(obj, partContentType, serializer) addPart( buildPartHeaders(name, headers), partBody.toRequestBody(partMediaType) @@ -179,11 +186,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie if (it is File) { addPartToMultiPart(name, part.headers, it) } else { - addPartToMultiPart(name, part.headers, it) + addPartToMultiPart(name, part.headers, it, part.serializer) } } } - else -> addPartToMultiPart(name, part.headers, part.body) + else -> addPartToMultiPart(name, part.headers, part.body, part.serializer) } } }.build() diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt index be00e38fbaee..c2a5c99ec7e6 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -4,8 +4,16 @@ package org.openapitools.client.infrastructure * Defines a config object for a given part of a multi-part request. * NOTE: Headers is a Map because rfc2616 defines * multi-valued headers as csv-only. + * + * @property headers The headers for this part + * @property body The body content for this part + * @property serializer Optional custom serializer for JSON content. When provided, this will be + * used instead of the default serialization for parts with application/json + * content-type. This allows capturing type information at the call site to + * avoid issues with type erasure in kotlinx.serialization. */ data class PartConfig( val headers: MutableMap = mutableMapOf(), - val body: T? = null + val body: T? = null, + val serializer: ((Any?) -> String)? = null ) From b496b4dedc062d5e64e9e9016dcd3b45d75aa2d8 Mon Sep 17 00:00:00 2001 From: Alex Humphreys Date: Wed, 4 Feb 2026 12:11:43 +0100 Subject: [PATCH 6/6] Fix internal Ktor API usage in multipart forms --- .../libraries/multiplatform/api.mustache | 28 +++++++++++++++++-- .../openapitools/client/apis/DefaultApi.kt | 4 +++ .../openapitools/client/apis/DefaultApi.kt | 4 +++ .../openapitools/client/apis/DefaultApi.kt | 22 +++++++++------ .../org/openapitools/client/apis/BirdApi.kt | 6 +++- .../org/openapitools/client/apis/PetApi.kt | 4 +++ .../org/openapitools/client/apis/StoreApi.kt | 4 +++ .../org/openapitools/client/apis/UserApi.kt | 4 +++ .../org/openapitools/client/apis/PetApi.kt | 4 +++ .../org/openapitools/client/apis/StoreApi.kt | 4 +++ .../org/openapitools/client/apis/UserApi.kt | 4 +++ 11 files changed, 76 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache index 8183a976081c..cf5a4fe733e7 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache @@ -11,6 +11,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* @@ -76,11 +80,31 @@ import kotlinx.serialization.encoding.* {{#formParams}} {{#isArray}} {{{paramName}}}?.onEach { - {{#isFile}}append(it){{/isFile}}{{^isFile}}append("{{{baseName}}}", it){{/isFile}} + {{#isFile}}append(it){{/isFile}}{{^isFile}}append("{{{baseName}}}", it.toString()){{/isFile}} } {{/isArray}} {{^isArray}} - {{{paramName}}}?.apply { {{#isFile}}append({{{baseName}}}){{/isFile}}{{^isFile}}append("{{{baseName}}}", {{^isEnumOrRef}}{{{paramName}}}{{/isEnumOrRef}}{{#isEnumOrRef}}{{{paramName}}}.value{{/isEnumOrRef}}){{/isFile}} } + {{#isFile}} + {{{paramName}}}?.apply { append({{{baseName}}}) } + {{/isFile}} + {{^isFile}} + {{#isPrimitiveType}} + {{#isString}} + {{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}) } + {{/isString}} + {{^isString}} + {{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}.toString()) } + {{/isString}} + {{/isPrimitiveType}} + {{^isPrimitiveType}} + {{#isEnumOrRef}} + {{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}.value.toString()) } + {{/isEnumOrRef}} + {{^isEnumOrRef}} + {{{paramName}}}?.apply { append("{{{baseName}}}", ApiClient.JSON_DEFAULT.encodeToString({{{dataType}}}.serializer(), {{{paramName}}})) } + {{/isEnumOrRef}} + {{/isPrimitiveType}} + {{/isFile}} {{/isArray}} {{/formParams}} } diff --git a/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt b/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt index 08ccdb94bbf2..387a5ac8bbb6 100644 --- a/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt +++ b/samples/client/petstore/kotlin-array-simple-string-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt @@ -23,6 +23,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* diff --git a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt index 56c0a2aeadcc..efadf7cea19a 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt @@ -24,6 +24,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* diff --git a/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt b/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt index d27ffacb3d91..255de9e58e83 100644 --- a/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt +++ b/samples/client/petstore/kotlin-default-values-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt @@ -23,6 +23,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* @@ -81,16 +85,16 @@ open class DefaultApi : ApiClient { val localVariableBody = formData { - fi0?.apply { append("fi0", fi0) } - fi1?.apply { append("fi1", fi1) } - fi2?.apply { append("fi2", fi2) } - fi3?.apply { append("fi3", fi3) } - fn0?.apply { append("fn0", fn0) } - fn1?.apply { append("fn1", fn1) } - fn2?.apply { append("fn2", fn2) } - fn3?.apply { append("fn3", fn3) } + fi0?.apply { append("fi0", fi0.toString()) } + fi1?.apply { append("fi1", fi1.toString()) } + fi2?.apply { append("fi2", fi2.toString()) } + fi3?.apply { append("fi3", fi3.toString()) } + fn0?.apply { append("fn0", fn0.toString()) } + fn1?.apply { append("fn1", fn1.toString()) } + fn2?.apply { append("fn2", fn2.toString()) } + fn3?.apply { append("fn3", fn3.toString()) } fn4?.onEach { - append("fn4", it) + append("fn4", it.toString()) } } diff --git a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/apis/BirdApi.kt b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/apis/BirdApi.kt index b315d30a328e..5ba97f5930a8 100644 --- a/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/apis/BirdApi.kt +++ b/samples/client/petstore/kotlin-multiplatform-allOf-discriminator/src/commonMain/kotlin/org/openapitools/client/apis/BirdApi.kt @@ -24,6 +24,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* @@ -89,7 +93,7 @@ open class BirdApi : ApiClient { val localVariableBody = formData { - metadata?.apply { append("metadata", metadata) } + metadata?.apply { append("metadata", ApiClient.JSON_DEFAULT.encodeToString(Bird.serializer(), metadata)) } file?.apply { append(file) } } diff --git a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index b13983df903e..72c008a77f55 100644 --- a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -25,6 +25,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* diff --git a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt index f388648f25ea..4d0a2f338e0a 100644 --- a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -24,6 +24,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* diff --git a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt index 0cfcbb91c758..5347a428fe97 100644 --- a/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-multiplatform-kotlinx-datetime/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt @@ -24,6 +24,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index b13983df903e..72c008a77f55 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -25,6 +25,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt index f388648f25ea..4d0a2f338e0a 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -24,6 +24,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt index 0cfcbb91c758..5347a428fe97 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt @@ -24,6 +24,10 @@ import io.ktor.client.request.forms.formData import io.ktor.client.engine.HttpClientEngine import kotlinx.serialization.json.Json import io.ktor.http.ParametersBuilder +import io.ktor.http.Headers +import io.ktor.http.HttpHeaders +import io.ktor.http.ContentType +import io.ktor.http.content.PartData import kotlinx.serialization.* import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.*