Skip to content

[kotlin][client] define kotlin coroutines context#9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 4 commits into from
Jul 13, 2021
Merged

[kotlin][client] define kotlin coroutines context #9936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d3e467
[kotlin][client] define coroutines context
4brunu Jul 12, 2021
3b9e832
[kotlin][client] update sample projects
4brunu Jul 12, 2021
1666fbc
[kotlin][client] add missing kotlinx coroutines dependency
4brunu Jul 12, 2021
0f9d5f7
[kotlin][client] update sample projects
4brunu Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,11 @@ test {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
{{#moshi}}
{{^moshiCodeGen}}
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
Expand Down
10 changes: 8 additions & 2 deletions modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ package {{apiPackage}}
{{#imports}}import {{import}}
{{/imports}}

{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
import {{packageName}}.infrastructure.ApiClient
import {{packageName}}.infrastructure.ClientException
import {{packageName}}.infrastructure.ClientError
Expand DownExpand Up@@ -40,7 +46,7 @@ import {{packageName}}.infrastructure.toMultiValue
{{#isDeprecated}}
@Deprecated(message = "This operation is deprecated.")
{{/isDeprecated}}
{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
{{#isDeprecated}}
@Suppress("DEPRECATION")
{{/isDeprecated}}
Expand All@@ -50,7 +56,7 @@ import {{packageName}}.infrastructure.toMultiValue
localVariableConfig
)

return when (localVarResponse.responseType) {
return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ test {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
implementation "com.google.code.gson:gson:2.8.7"
implementation "com.squareup.okhttp3:okhttp:4.9.1"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
Expand Down
34 changes: 18 additions & 16 deletions ...tore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ package org.openapitools.client.apis
import org.openapitools.client.models.ApiResponse
import org.openapitools.client.models.Pet

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -44,14 +46,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
* @throws ServerException If the API returns a server error response
*/
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun addPet(body: Pet) : Unit {
suspend fun addPet(body: Pet) : Unit = withContext(Dispatchers.IO) {
val localVariableConfig = addPetRequestConfig(body = body)

val localVarResponse = request<Pet, Unit>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> Unit
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -97,14 +99,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
* @throws ServerException If the API returns a server error response
*/
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)

val localVarResponse = request<Unit, Unit>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> Unit
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -152,14 +154,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
*/
@Suppress("UNCHECKED_CAST")
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
val localVariableConfig = findPetsByStatusRequestConfig(status = status)

val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -209,15 +211,15 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
@Suppress("UNCHECKED_CAST")
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
@Deprecated(message = "This operation is deprecated.")
suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
@Suppress("DEPRECATION")
val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)

val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -267,14 +269,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
*/
@Suppress("UNCHECKED_CAST")
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun getPetById(petId: kotlin.Long) : Pet {
suspend fun getPetById(petId: kotlin.Long) : Pet = withContext(Dispatchers.IO) {
val localVariableConfig = getPetByIdRequestConfig(petId = petId)

val localVarResponse = request<Unit, Pet>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -319,14 +321,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
* @throws ServerException If the API returns a server error response
*/
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun updatePet(body: Pet) : Unit {
suspend fun updatePet(body: Pet) : Unit = withContext(Dispatchers.IO) {
val localVariableConfig = updatePetRequestConfig(body = body)

val localVarResponse = request<Pet, Unit>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> Unit
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -373,14 +375,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
* @throws ServerException If the API returns a server error response
*/
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)

val localVarResponse = request<Map<String, Any?>, Unit>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> Unit
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -430,14 +432,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
*/
@Suppress("UNCHECKED_CAST")
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse = withContext(Dispatchers.IO) {
val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)

val localVarResponse = request<Map<String, Any?>, ApiResponse>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
18 changes: 10 additions & 8 deletions ...re/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ package org.openapitools.client.apis

import org.openapitools.client.models.Order

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -43,14 +45,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
* @throws ServerException If the API returns a server error response
*/
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun deleteOrder(orderId: kotlin.String) : Unit {
suspend fun deleteOrder(orderId: kotlin.String) : Unit = withContext(Dispatchers.IO) {
val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)

val localVarResponse = request<Unit, Unit>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> Unit
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -95,14 +97,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
*/
@Suppress("UNCHECKED_CAST")
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> = withContext(Dispatchers.IO) {
val localVariableConfig = getInventoryRequestConfig()

val localVarResponse = request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Int>>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -147,14 +149,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
*/
@Suppress("UNCHECKED_CAST")
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun getOrderById(orderId: kotlin.Long) : Order {
suspend fun getOrderById(orderId: kotlin.Long) : Order = withContext(Dispatchers.IO) {
val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)

val localVarResponse = request<Unit, Order>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> (localVarResponse as Success<*>).data as Order
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -200,14 +202,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
*/
@Suppress("UNCHECKED_CAST")
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
suspend fun placeOrder(body: Order) : Order {
suspend fun placeOrder(body: Order) : Order = withContext(Dispatchers.IO) {
val localVariableConfig = placeOrderRequestConfig(body = body)

val localVarResponse = request<Order, Order>(
localVariableConfig
)

return when (localVarResponse.responseType) {
return@withContext when (localVarResponse.responseType) {
ResponseType.Success -> (localVarResponse as Success<*>).data as Order
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[kotlin][client] define kotlin coroutines context by 4brunu · Pull Request #9936 · OpenAPITools/openapi-generator · GitHub
Skip to content
[kotlin][client] define kotlin coroutines context#9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 4 commits into

from

Jul 13, 2021
 Merged


[kotlin][client] define kotlin coroutines context
#9936
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d3e467

[kotlin][client] define coroutines context


4brunu Jul 12, 2021
3b9e832

[kotlin][client] update sample projects


4brunu Jul 12, 2021
1666fbc

[kotlin][client] add missing kotlinx coroutines dependency


4brunu Jul 12, 2021
0f9d5f7

[kotlin][client] update sample projects


4brunu Jul 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,11 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 {{^doNotUseRxAndCoroutines}}
 {{#useCoroutines}}
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 {{/useCoroutines}}
 {{/doNotUseRxAndCoroutines}}
 {{#moshi}}
 {{^moshiCodeGen}}
 implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
Expand Down

10 changes: 8 additions & 2 deletions
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ package {{apiPackage}}
{{#imports}}import {{import}}
{{/imports}}

{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
import {{packageName}}.infrastructure.ApiClient
import {{packageName}}.infrastructure.ClientException
import {{packageName}}.infrastructure.ClientError
Expand DownExpand Up@@ -40,7 +46,7 @@ import {{packageName}}.infrastructure.toMultiValue
 {{#isDeprecated}}
 @Deprecated(message = "This operation is deprecated.")
 {{/isDeprecated}}
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
 {{#isDeprecated}}
 @Suppress("DEPRECATION")
 {{/isDeprecated}}
Expand All@@ -50,7 +56,7 @@ import {{packageName}}.infrastructure.toMultiValue
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
 ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 implementation "com.google.code.gson:gson:2.8.7"
 implementation "com.squareup.okhttp3:okhttp:4.9.1"
 testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
Expand Down

34 changes: 18 additions & 16 deletions
...tore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ package org.openapitools.client.apis
import org.openapitools.client.models.ApiResponse
import org.openapitools.client.models.Pet

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -44,14 +46,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun addPet(body: Pet) : Unit {
 suspend fun addPet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = addPetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -97,14 +99,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -152,14 +154,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 val localVariableConfig = findPetsByStatusRequestConfig(status = status)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -209,15 +211,15 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 @Deprecated(message = "This operation is deprecated.")
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 @Suppress("DEPRECATION")
 val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -267,14 +269,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getPetById(petId: kotlin.Long) : Pet {
 suspend fun getPetById(petId: kotlin.Long) : Pet = withContext(Dispatchers.IO) {
 val localVariableConfig = getPetByIdRequestConfig(petId = petId)

 val localVarResponse = request<Unit, Pet>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -319,14 +321,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePet(body: Pet) : Unit {
 suspend fun updatePet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -373,14 +375,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)

 val localVarResponse = request<Map<String, Any?>, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -430,14 +432,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse = withContext(Dispatchers.IO) {
 val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)

 val localVarResponse = request<Map<String, Any?>, ApiResponse>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

18 changes: 10 additions & 8 deletions
...re/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ package org.openapitools.client.apis

import org.openapitools.client.models.Order

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -43,14 +45,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deleteOrder(orderId: kotlin.String) : Unit {
 suspend fun deleteOrder(orderId: kotlin.String) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -95,14 +97,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> = withContext(Dispatchers.IO) {
 val localVariableConfig = getInventoryRequestConfig()

 val localVarResponse = request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Int>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -147,14 +149,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getOrderById(orderId: kotlin.Long) : Order {
 suspend fun getOrderById(orderId: kotlin.Long) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -200,14 +202,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun placeOrder(body: Order) : Order {
 suspend fun placeOrder(body: Order) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = placeOrderRequestConfig(body = body)

 val localVarResponse = request<Order, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[kotlin][client] define kotlin coroutines context by 4brunu · Pull Request #9936 · OpenAPITools/openapi-generator · GitHub
Skip to content
[kotlin][client] define kotlin coroutines context#9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 4 commits into

from

Jul 13, 2021
 Merged


[kotlin][client] define kotlin coroutines context
#9936
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d3e467

[kotlin][client] define coroutines context


4brunu Jul 12, 2021
3b9e832

[kotlin][client] update sample projects


4brunu Jul 12, 2021
1666fbc

[kotlin][client] add missing kotlinx coroutines dependency


4brunu Jul 12, 2021
0f9d5f7

[kotlin][client] update sample projects


4brunu Jul 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,11 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 {{^doNotUseRxAndCoroutines}}
 {{#useCoroutines}}
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 {{/useCoroutines}}
 {{/doNotUseRxAndCoroutines}}
 {{#moshi}}
 {{^moshiCodeGen}}
 implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
Expand Down

10 changes: 8 additions & 2 deletions
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ package {{apiPackage}}
{{#imports}}import {{import}}
{{/imports}}

{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
import {{packageName}}.infrastructure.ApiClient
import {{packageName}}.infrastructure.ClientException
import {{packageName}}.infrastructure.ClientError
Expand DownExpand Up@@ -40,7 +46,7 @@ import {{packageName}}.infrastructure.toMultiValue
 {{#isDeprecated}}
 @Deprecated(message = "This operation is deprecated.")
 {{/isDeprecated}}
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
 {{#isDeprecated}}
 @Suppress("DEPRECATION")
 {{/isDeprecated}}
Expand All@@ -50,7 +56,7 @@ import {{packageName}}.infrastructure.toMultiValue
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
 ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 implementation "com.google.code.gson:gson:2.8.7"
 implementation "com.squareup.okhttp3:okhttp:4.9.1"
 testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
Expand Down

34 changes: 18 additions & 16 deletions
...tore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ package org.openapitools.client.apis
import org.openapitools.client.models.ApiResponse
import org.openapitools.client.models.Pet

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -44,14 +46,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun addPet(body: Pet) : Unit {
 suspend fun addPet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = addPetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -97,14 +99,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -152,14 +154,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 val localVariableConfig = findPetsByStatusRequestConfig(status = status)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -209,15 +211,15 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 @Deprecated(message = "This operation is deprecated.")
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 @Suppress("DEPRECATION")
 val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -267,14 +269,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getPetById(petId: kotlin.Long) : Pet {
 suspend fun getPetById(petId: kotlin.Long) : Pet = withContext(Dispatchers.IO) {
 val localVariableConfig = getPetByIdRequestConfig(petId = petId)

 val localVarResponse = request<Unit, Pet>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -319,14 +321,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePet(body: Pet) : Unit {
 suspend fun updatePet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -373,14 +375,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)

 val localVarResponse = request<Map<String, Any?>, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -430,14 +432,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse = withContext(Dispatchers.IO) {
 val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)

 val localVarResponse = request<Map<String, Any?>, ApiResponse>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

18 changes: 10 additions & 8 deletions
...re/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ package org.openapitools.client.apis

import org.openapitools.client.models.Order

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -43,14 +45,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deleteOrder(orderId: kotlin.String) : Unit {
 suspend fun deleteOrder(orderId: kotlin.String) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -95,14 +97,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> = withContext(Dispatchers.IO) {
 val localVariableConfig = getInventoryRequestConfig()

 val localVarResponse = request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Int>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -147,14 +149,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getOrderById(orderId: kotlin.Long) : Order {
 suspend fun getOrderById(orderId: kotlin.Long) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -200,14 +202,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun placeOrder(body: Order) : Order {
 suspend fun placeOrder(body: Order) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = placeOrderRequestConfig(body = body)

 val localVarResponse = request<Order, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[kotlin][client] define kotlin coroutines context by 4brunu · Pull Request #9936 · OpenAPITools/openapi-generator · GitHub
Skip to content
[kotlin][client] define kotlin coroutines context#9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 4 commits into

from

Jul 13, 2021
 Merged


[kotlin][client] define kotlin coroutines context
#9936
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d3e467

[kotlin][client] define coroutines context


4brunu Jul 12, 2021
3b9e832

[kotlin][client] update sample projects


4brunu Jul 12, 2021
1666fbc

[kotlin][client] add missing kotlinx coroutines dependency


4brunu Jul 12, 2021
0f9d5f7

[kotlin][client] update sample projects


4brunu Jul 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,11 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 {{^doNotUseRxAndCoroutines}}
 {{#useCoroutines}}
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 {{/useCoroutines}}
 {{/doNotUseRxAndCoroutines}}
 {{#moshi}}
 {{^moshiCodeGen}}
 implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
Expand Down

10 changes: 8 additions & 2 deletions
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ package {{apiPackage}}
{{#imports}}import {{import}}
{{/imports}}

{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
import {{packageName}}.infrastructure.ApiClient
import {{packageName}}.infrastructure.ClientException
import {{packageName}}.infrastructure.ClientError
Expand DownExpand Up@@ -40,7 +46,7 @@ import {{packageName}}.infrastructure.toMultiValue
 {{#isDeprecated}}
 @Deprecated(message = "This operation is deprecated.")
 {{/isDeprecated}}
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
 {{#isDeprecated}}
 @Suppress("DEPRECATION")
 {{/isDeprecated}}
Expand All@@ -50,7 +56,7 @@ import {{packageName}}.infrastructure.toMultiValue
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
 ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 implementation "com.google.code.gson:gson:2.8.7"
 implementation "com.squareup.okhttp3:okhttp:4.9.1"
 testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
Expand Down

34 changes: 18 additions & 16 deletions
...tore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ package org.openapitools.client.apis
import org.openapitools.client.models.ApiResponse
import org.openapitools.client.models.Pet

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -44,14 +46,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun addPet(body: Pet) : Unit {
 suspend fun addPet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = addPetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -97,14 +99,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -152,14 +154,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 val localVariableConfig = findPetsByStatusRequestConfig(status = status)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -209,15 +211,15 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 @Deprecated(message = "This operation is deprecated.")
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 @Suppress("DEPRECATION")
 val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -267,14 +269,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getPetById(petId: kotlin.Long) : Pet {
 suspend fun getPetById(petId: kotlin.Long) : Pet = withContext(Dispatchers.IO) {
 val localVariableConfig = getPetByIdRequestConfig(petId = petId)

 val localVarResponse = request<Unit, Pet>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -319,14 +321,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePet(body: Pet) : Unit {
 suspend fun updatePet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -373,14 +375,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)

 val localVarResponse = request<Map<String, Any?>, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -430,14 +432,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse = withContext(Dispatchers.IO) {
 val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)

 val localVarResponse = request<Map<String, Any?>, ApiResponse>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

18 changes: 10 additions & 8 deletions
...re/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ package org.openapitools.client.apis

import org.openapitools.client.models.Order

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -43,14 +45,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deleteOrder(orderId: kotlin.String) : Unit {
 suspend fun deleteOrder(orderId: kotlin.String) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -95,14 +97,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> = withContext(Dispatchers.IO) {
 val localVariableConfig = getInventoryRequestConfig()

 val localVarResponse = request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Int>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -147,14 +149,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getOrderById(orderId: kotlin.Long) : Order {
 suspend fun getOrderById(orderId: kotlin.Long) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -200,14 +202,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun placeOrder(body: Order) : Order {
 suspend fun placeOrder(body: Order) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = placeOrderRequestConfig(body = body)

 val localVarResponse = request<Order, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[kotlin][client] define kotlin coroutines context by 4brunu · Pull Request #9936 · OpenAPITools/openapi-generator · GitHub
Skip to content
[kotlin][client] define kotlin coroutines context#9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 4 commits into

from

Jul 13, 2021
 Merged


[kotlin][client] define kotlin coroutines context
#9936
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d3e467

[kotlin][client] define coroutines context


4brunu Jul 12, 2021
3b9e832

[kotlin][client] update sample projects


4brunu Jul 12, 2021
1666fbc

[kotlin][client] add missing kotlinx coroutines dependency


4brunu Jul 12, 2021
0f9d5f7

[kotlin][client] update sample projects


4brunu Jul 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,11 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 {{^doNotUseRxAndCoroutines}}
 {{#useCoroutines}}
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 {{/useCoroutines}}
 {{/doNotUseRxAndCoroutines}}
 {{#moshi}}
 {{^moshiCodeGen}}
 implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
Expand Down

10 changes: 8 additions & 2 deletions
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ package {{apiPackage}}
{{#imports}}import {{import}}
{{/imports}}

{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
import {{packageName}}.infrastructure.ApiClient
import {{packageName}}.infrastructure.ClientException
import {{packageName}}.infrastructure.ClientError
Expand DownExpand Up@@ -40,7 +46,7 @@ import {{packageName}}.infrastructure.toMultiValue
 {{#isDeprecated}}
 @Deprecated(message = "This operation is deprecated.")
 {{/isDeprecated}}
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
 {{#isDeprecated}}
 @Suppress("DEPRECATION")
 {{/isDeprecated}}
Expand All@@ -50,7 +56,7 @@ import {{packageName}}.infrastructure.toMultiValue
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
 ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 implementation "com.google.code.gson:gson:2.8.7"
 implementation "com.squareup.okhttp3:okhttp:4.9.1"
 testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
Expand Down

34 changes: 18 additions & 16 deletions
...tore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ package org.openapitools.client.apis
import org.openapitools.client.models.ApiResponse
import org.openapitools.client.models.Pet

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -44,14 +46,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun addPet(body: Pet) : Unit {
 suspend fun addPet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = addPetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -97,14 +99,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -152,14 +154,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 val localVariableConfig = findPetsByStatusRequestConfig(status = status)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -209,15 +211,15 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 @Deprecated(message = "This operation is deprecated.")
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 @Suppress("DEPRECATION")
 val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -267,14 +269,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getPetById(petId: kotlin.Long) : Pet {
 suspend fun getPetById(petId: kotlin.Long) : Pet = withContext(Dispatchers.IO) {
 val localVariableConfig = getPetByIdRequestConfig(petId = petId)

 val localVarResponse = request<Unit, Pet>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -319,14 +321,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePet(body: Pet) : Unit {
 suspend fun updatePet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -373,14 +375,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)

 val localVarResponse = request<Map<String, Any?>, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -430,14 +432,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse = withContext(Dispatchers.IO) {
 val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)

 val localVarResponse = request<Map<String, Any?>, ApiResponse>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

18 changes: 10 additions & 8 deletions
...re/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ package org.openapitools.client.apis

import org.openapitools.client.models.Order

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -43,14 +45,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deleteOrder(orderId: kotlin.String) : Unit {
 suspend fun deleteOrder(orderId: kotlin.String) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -95,14 +97,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> = withContext(Dispatchers.IO) {
 val localVariableConfig = getInventoryRequestConfig()

 val localVarResponse = request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Int>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -147,14 +149,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getOrderById(orderId: kotlin.Long) : Order {
 suspend fun getOrderById(orderId: kotlin.Long) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -200,14 +202,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun placeOrder(body: Order) : Order {
 suspend fun placeOrder(body: Order) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = placeOrderRequestConfig(body = body)

 val localVarResponse = request<Order, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[kotlin][client] define kotlin coroutines context by 4brunu · Pull Request #9936 · OpenAPITools/openapi-generator · GitHub
Skip to content
[kotlin][client] define kotlin coroutines context#9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 4 commits into

from

Jul 13, 2021
 Merged


[kotlin][client] define kotlin coroutines context
#9936
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d3e467

[kotlin][client] define coroutines context


4brunu Jul 12, 2021
3b9e832

[kotlin][client] update sample projects


4brunu Jul 12, 2021
1666fbc

[kotlin][client] add missing kotlinx coroutines dependency


4brunu Jul 12, 2021
0f9d5f7

[kotlin][client] update sample projects


4brunu Jul 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,11 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 {{^doNotUseRxAndCoroutines}}
 {{#useCoroutines}}
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 {{/useCoroutines}}
 {{/doNotUseRxAndCoroutines}}
 {{#moshi}}
 {{^moshiCodeGen}}
 implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
Expand Down

10 changes: 8 additions & 2 deletions
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ package {{apiPackage}}
{{#imports}}import {{import}}
{{/imports}}

{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
import {{packageName}}.infrastructure.ApiClient
import {{packageName}}.infrastructure.ClientException
import {{packageName}}.infrastructure.ClientError
Expand DownExpand Up@@ -40,7 +46,7 @@ import {{packageName}}.infrastructure.toMultiValue
 {{#isDeprecated}}
 @Deprecated(message = "This operation is deprecated.")
 {{/isDeprecated}}
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
 {{#isDeprecated}}
 @Suppress("DEPRECATION")
 {{/isDeprecated}}
Expand All@@ -50,7 +56,7 @@ import {{packageName}}.infrastructure.toMultiValue
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
 ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 implementation "com.google.code.gson:gson:2.8.7"
 implementation "com.squareup.okhttp3:okhttp:4.9.1"
 testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
Expand Down

34 changes: 18 additions & 16 deletions
...tore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ package org.openapitools.client.apis
import org.openapitools.client.models.ApiResponse
import org.openapitools.client.models.Pet

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -44,14 +46,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun addPet(body: Pet) : Unit {
 suspend fun addPet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = addPetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -97,14 +99,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -152,14 +154,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 val localVariableConfig = findPetsByStatusRequestConfig(status = status)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -209,15 +211,15 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 @Deprecated(message = "This operation is deprecated.")
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 @Suppress("DEPRECATION")
 val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -267,14 +269,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getPetById(petId: kotlin.Long) : Pet {
 suspend fun getPetById(petId: kotlin.Long) : Pet = withContext(Dispatchers.IO) {
 val localVariableConfig = getPetByIdRequestConfig(petId = petId)

 val localVarResponse = request<Unit, Pet>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -319,14 +321,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePet(body: Pet) : Unit {
 suspend fun updatePet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -373,14 +375,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)

 val localVarResponse = request<Map<String, Any?>, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -430,14 +432,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse = withContext(Dispatchers.IO) {
 val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)

 val localVarResponse = request<Map<String, Any?>, ApiResponse>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

18 changes: 10 additions & 8 deletions
...re/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ package org.openapitools.client.apis

import org.openapitools.client.models.Order

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -43,14 +45,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deleteOrder(orderId: kotlin.String) : Unit {
 suspend fun deleteOrder(orderId: kotlin.String) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -95,14 +97,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> = withContext(Dispatchers.IO) {
 val localVariableConfig = getInventoryRequestConfig()

 val localVarResponse = request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Int>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -147,14 +149,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getOrderById(orderId: kotlin.Long) : Order {
 suspend fun getOrderById(orderId: kotlin.Long) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -200,14 +202,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun placeOrder(body: Order) : Order {
 suspend fun placeOrder(body: Order) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = placeOrderRequestConfig(body = body)

 val localVarResponse = request<Order, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[kotlin][client] define kotlin coroutines context by 4brunu · Pull Request #9936 · OpenAPITools/openapi-generator · GitHub
Skip to content
[kotlin][client] define kotlin coroutines context#9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 4 commits into

from

Jul 13, 2021
 Merged


[kotlin][client] define kotlin coroutines context
#9936
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d3e467

[kotlin][client] define coroutines context


4brunu Jul 12, 2021
3b9e832

[kotlin][client] update sample projects


4brunu Jul 12, 2021
1666fbc

[kotlin][client] add missing kotlinx coroutines dependency


4brunu Jul 12, 2021
0f9d5f7

[kotlin][client] update sample projects


4brunu Jul 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,11 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 {{^doNotUseRxAndCoroutines}}
 {{#useCoroutines}}
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 {{/useCoroutines}}
 {{/doNotUseRxAndCoroutines}}
 {{#moshi}}
 {{^moshiCodeGen}}
 implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
Expand Down

10 changes: 8 additions & 2 deletions
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ package {{apiPackage}}
{{#imports}}import {{import}}
{{/imports}}

{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
import {{packageName}}.infrastructure.ApiClient
import {{packageName}}.infrastructure.ClientException
import {{packageName}}.infrastructure.ClientError
Expand DownExpand Up@@ -40,7 +46,7 @@ import {{packageName}}.infrastructure.toMultiValue
 {{#isDeprecated}}
 @Deprecated(message = "This operation is deprecated.")
 {{/isDeprecated}}
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
 {{#isDeprecated}}
 @Suppress("DEPRECATION")
 {{/isDeprecated}}
Expand All@@ -50,7 +56,7 @@ import {{packageName}}.infrastructure.toMultiValue
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
 ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 implementation "com.google.code.gson:gson:2.8.7"
 implementation "com.squareup.okhttp3:okhttp:4.9.1"
 testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
Expand Down

34 changes: 18 additions & 16 deletions
...tore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ package org.openapitools.client.apis
import org.openapitools.client.models.ApiResponse
import org.openapitools.client.models.Pet

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -44,14 +46,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun addPet(body: Pet) : Unit {
 suspend fun addPet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = addPetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -97,14 +99,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -152,14 +154,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 val localVariableConfig = findPetsByStatusRequestConfig(status = status)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -209,15 +211,15 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 @Deprecated(message = "This operation is deprecated.")
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 @Suppress("DEPRECATION")
 val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -267,14 +269,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getPetById(petId: kotlin.Long) : Pet {
 suspend fun getPetById(petId: kotlin.Long) : Pet = withContext(Dispatchers.IO) {
 val localVariableConfig = getPetByIdRequestConfig(petId = petId)

 val localVarResponse = request<Unit, Pet>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -319,14 +321,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePet(body: Pet) : Unit {
 suspend fun updatePet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -373,14 +375,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)

 val localVarResponse = request<Map<String, Any?>, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -430,14 +432,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse = withContext(Dispatchers.IO) {
 val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)

 val localVarResponse = request<Map<String, Any?>, ApiResponse>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

18 changes: 10 additions & 8 deletions
...re/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ package org.openapitools.client.apis

import org.openapitools.client.models.Order

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -43,14 +45,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deleteOrder(orderId: kotlin.String) : Unit {
 suspend fun deleteOrder(orderId: kotlin.String) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -95,14 +97,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> = withContext(Dispatchers.IO) {
 val localVariableConfig = getInventoryRequestConfig()

 val localVarResponse = request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Int>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -147,14 +149,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getOrderById(orderId: kotlin.Long) : Order {
 suspend fun getOrderById(orderId: kotlin.Long) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -200,14 +202,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun placeOrder(body: Order) : Order {
 suspend fun placeOrder(body: Order) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = placeOrderRequestConfig(body = body)

 val localVarResponse = request<Order, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[kotlin][client] define kotlin coroutines context by 4brunu · Pull Request #9936 · OpenAPITools/openapi-generator · GitHub
Skip to content
[kotlin][client] define kotlin coroutines context#9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 4 commits into

from

Jul 13, 2021
 Merged


[kotlin][client] define kotlin coroutines context
#9936
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d3e467

[kotlin][client] define coroutines context


4brunu Jul 12, 2021
3b9e832

[kotlin][client] update sample projects


4brunu Jul 12, 2021
1666fbc

[kotlin][client] add missing kotlinx coroutines dependency


4brunu Jul 12, 2021
0f9d5f7

[kotlin][client] update sample projects


4brunu Jul 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,11 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 {{^doNotUseRxAndCoroutines}}
 {{#useCoroutines}}
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 {{/useCoroutines}}
 {{/doNotUseRxAndCoroutines}}
 {{#moshi}}
 {{^moshiCodeGen}}
 implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
Expand Down

10 changes: 8 additions & 2 deletions
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ package {{apiPackage}}
{{#imports}}import {{import}}
{{/imports}}

{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
import {{packageName}}.infrastructure.ApiClient
import {{packageName}}.infrastructure.ClientException
import {{packageName}}.infrastructure.ClientError
Expand DownExpand Up@@ -40,7 +46,7 @@ import {{packageName}}.infrastructure.toMultiValue
 {{#isDeprecated}}
 @Deprecated(message = "This operation is deprecated.")
 {{/isDeprecated}}
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
 {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
 {{#isDeprecated}}
 @Suppress("DEPRECATION")
 {{/isDeprecated}}
Expand All@@ -50,7 +56,7 @@ import {{packageName}}.infrastructure.toMultiValue
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
 ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ test {

dependencies {
 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
 implementation "com.google.code.gson:gson:2.8.7"
 implementation "com.squareup.okhttp3:okhttp:4.9.1"
 testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
Expand Down

34 changes: 18 additions & 16 deletions
...tore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ package org.openapitools.client.apis
import org.openapitools.client.models.ApiResponse
import org.openapitools.client.models.Pet

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -44,14 +46,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun addPet(body: Pet) : Unit {
 suspend fun addPet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = addPetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -97,14 +99,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
 suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -152,14 +154,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 val localVariableConfig = findPetsByStatusRequestConfig(status = status)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -209,15 +211,15 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 @Deprecated(message = "This operation is deprecated.")
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
 suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> = withContext(Dispatchers.IO) {
 @Suppress("DEPRECATION")
 val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)

 val localVarResponse = request<Unit, kotlin.collections.List<Pet>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -267,14 +269,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getPetById(petId: kotlin.Long) : Pet {
 suspend fun getPetById(petId: kotlin.Long) : Pet = withContext(Dispatchers.IO) {
 val localVariableConfig = getPetByIdRequestConfig(petId = petId)

 val localVarResponse = request<Unit, Pet>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -319,14 +321,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePet(body: Pet) : Unit {
 suspend fun updatePet(body: Pet) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetRequestConfig(body = body)

 val localVarResponse = request<Pet, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -373,14 +375,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
 suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)

 val localVarResponse = request<Map<String, Any?>, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -430,14 +432,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
 suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse = withContext(Dispatchers.IO) {
 val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)

 val localVarResponse = request<Map<String, Any?>, ApiResponse>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down

18 changes: 10 additions & 8 deletions
...re/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ package org.openapitools.client.apis

import org.openapitools.client.models.Order

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.openapitools.client.infrastructure.ApiClient
import org.openapitools.client.infrastructure.ClientException
import org.openapitools.client.infrastructure.ClientError
Expand DownExpand Up@@ -43,14 +45,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 * @throws ServerException If the API returns a server error response
 */
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun deleteOrder(orderId: kotlin.String) : Unit {
 suspend fun deleteOrder(orderId: kotlin.String) : Unit = withContext(Dispatchers.IO) {
 val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Unit>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> Unit
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -95,14 +97,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
 suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> = withContext(Dispatchers.IO) {
 val localVariableConfig = getInventoryRequestConfig()

 val localVarResponse = request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Int>>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -147,14 +149,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun getOrderById(orderId: kotlin.Long) : Order {
 suspend fun getOrderById(orderId: kotlin.Long) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)

 val localVarResponse = request<Unit, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand DownExpand Up@@ -200,14 +202,14 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 */
 @Suppress("UNCHECKED_CAST")
 @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
 suspend fun placeOrder(body: Order) : Order {
 suspend fun placeOrder(body: Order) : Order = withContext(Dispatchers.IO) {
 val localVariableConfig = placeOrderRequestConfig(body = body)

 val localVarResponse = request<Order, Order>(
 localVariableConfig
 )

 return when (localVarResponse.responseType) {
 return@withContext when (localVarResponse.responseType) {
 ResponseType.Success -> (localVarResponse as Success<*>).data as Order
 ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
 ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
Expand Down
Loading