loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

scala-sttp: fix for issue 15785 api returns unit. (#18537)

Browse Source
This commit is contained in:
Daniel Wischolek 2024-05-01 12:12:04 +02:00 committed by GitHub
parent 5e40fe7f8f
commit afd3a78e20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/resources/scala-sttp/api.mustache vendored
View File

@ -10,8 +10,7 @@ import sttp.model.Method
{{#operations}} {{#operations}}
object {{classname}} { object {{classname}} {
def apply(baseUrl: String = "{{{basePath}}}") = new {{classname}}(baseUrl)
def apply(baseUrl: String = "{{{basePath}}}") = new {{classname}}(baseUrl)
} }
class {{classname}}(baseUrl: String) { class {{classname}}(baseUrl: String) {
@ -20,7 +19,7 @@ class {{classname}}(baseUrl: String) {
{{#javadocRenderer}} {{#javadocRenderer}}
{{>javadoc}} {{>javadoc}}
{{/javadocRenderer}} {{/javadocRenderer}}
def {{operationId}}({{>methodParameters}}): Request[{{#defaultReturnType}}Either[Either[String, String], Unit]{{/defaultReturnType}}{{^defaultReturnType}}{{#separateErrorChannel}}Either[ResponseException[String, Exception], {{>operationReturnType}}]{{/separateErrorChannel}}{{^separateErrorChannel}}{{>operationReturnType}}{{/separateErrorChannel}}{{/defaultReturnType}}, Any] = def {{operationId}}({{>methodParameters}}): Request[{{#separateErrorChannel}}Either[ResponseException[String, Exception], {{>operationReturnType}}]{{/separateErrorChannel}}{{^separateErrorChannel}}{{>operationReturnType}}{{/separateErrorChannel}}, Any] =
basicRequest basicRequest
.method(Method.{{httpMethod.toUpperCase}}, uri"$baseUrl{{{path}}}{{#queryParams.0}}?{{#queryParams}}{{baseName}}=${ {{{paramName}}} }{{^-last}}&{{/-last}}{{/queryParams}}{{/queryParams.0}}{{#isApiKey}}{{#isKeyInQuery}}{{^queryParams.0}}?{{/queryParams.0}}{{#queryParams.0}}&{{/queryParams.0}}{{keyParamName}}=${apiKey.value}&{{/isKeyInQuery}}{{/isApiKey}}") .method(Method.{{httpMethod.toUpperCase}}, uri"$baseUrl{{{path}}}{{#queryParams.0}}?{{#queryParams}}{{baseName}}=${ {{{paramName}}} }{{^-last}}&{{/-last}}{{/queryParams}}{{/queryParams.0}}{{#isApiKey}}{{#isKeyInQuery}}{{^queryParams.0}}?{{/queryParams.0}}{{#queryParams.0}}&{{/queryParams.0}}{{keyParamName}}=${apiKey.value}&{{/isKeyInQuery}}{{/isApiKey}}")
.contentType({{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{^consumes}}"application/json"{{/consumes}}){{#headerParams}} .contentType({{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{^consumes}}"application/json"{{/consumes}}){{#headerParams}}
@ -36,7 +35,7 @@ class {{classname}}(baseUrl: String) {
{{>paramMultipartCreation}}{{^-last}}, {{/-last}}{{/formParams}} {{>paramMultipartCreation}}{{^-last}}, {{/-last}}{{/formParams}}
).flatten){{/isMultipart}}{{/formParams.0}}{{#bodyParam}} ).flatten){{/isMultipart}}{{/formParams.0}}{{#bodyParam}}
.body({{paramName}}){{/bodyParam}} .body({{paramName}}){{/bodyParam}}
.response({{#defaultReturnType}}asEither(asString, ignore){{/defaultReturnType}}{{^defaultReturnType}}{{#separateErrorChannel}}asJson{{/separateErrorChannel}}{{^separateErrorChannel}}asJsonAlwaysUnsafe{{/separateErrorChannel}}[{{>operationReturnType}}]{{/defaultReturnType}}) .response({{#separateErrorChannel}}{{^returnType}}asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))){{/returnType}}{{#returnType}}asJson[{{>operationReturnType}}]{{/returnType}}{{/separateErrorChannel}}{{^separateErrorChannel}}{{^returnType}}asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))).getRight{{/returnType}}{{#returnType}}asJson[{{>operationReturnType}}].getRight{{/returnType}}{{/separateErrorChannel}})
{{/operation}} {{/operation}}
} }

5
samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/FakeApi.scala
View File

@ -16,8 +16,7 @@ import sttp.client3._
import sttp.model.Method import sttp.model.Method
object FakeApi { object FakeApi {
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new FakeApi(baseUrl)
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new FakeApi(baseUrl)
} }
class FakeApi(baseUrl: String) { class FakeApi(baseUrl: String) {
@ -38,6 +37,6 @@ class FakeApi(baseUrl: String) {
.contentType("application/json") .contentType("application/json")
.header("_type", underscoreType.toString) .header("_type", underscoreType.toString)
.header("type_", typeWithUnderscore.toString) .header("type_", typeWithUnderscore.toString)
.response(asJson[Unit]) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
} }

7
samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala
View File

@ -19,8 +19,7 @@ import sttp.client3._
import sttp.model.Method import sttp.model.Method
object PetApi { object PetApi {
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new PetApi(baseUrl)
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new PetApi(baseUrl)
} }
class PetApi(baseUrl: String) { class PetApi(baseUrl: String) {
@ -57,7 +56,7 @@ class PetApi(baseUrl: String) {
.method(Method.DELETE, uri"$baseUrl/pet/${petId}") .method(Method.DELETE, uri"$baseUrl/pet/${petId}")
.contentType("application/json") .contentType("application/json")
.header("api_key", apiKey.toString) .header("api_key", apiKey.toString)
.response(asJson[Unit]) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
/** /**
* Multiple status values can be provided with comma separated strings * Multiple status values can be provided with comma separated strings
@ -150,7 +149,7 @@ class PetApi(baseUrl: String) {
"name" -> name, "name" -> name,
"status" -> status "status" -> status
)) ))
.response(asJson[Unit]) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
/** /**
* *

5
samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala
View File

@ -17,8 +17,7 @@ import sttp.client3._
import sttp.model.Method import sttp.model.Method
object StoreApi { object StoreApi {
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new StoreApi(baseUrl)
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new StoreApi(baseUrl)
} }
class StoreApi(baseUrl: String) { class StoreApi(baseUrl: String) {
@ -37,7 +36,7 @@ class StoreApi(baseUrl: String) {
basicRequest basicRequest
.method(Method.DELETE, uri"$baseUrl/store/order/${orderId}") .method(Method.DELETE, uri"$baseUrl/store/order/${orderId}")
.contentType("application/json") .contentType("application/json")
.response(asJson[Unit]) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
/** /**
* Returns a map of status codes to quantities * Returns a map of status codes to quantities

23
samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/UserApi.scala
View File

@ -18,8 +18,7 @@ import sttp.client3._
import sttp.model.Method import sttp.model.Method
object UserApi { object UserApi {
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new UserApi(baseUrl)
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new UserApi(baseUrl)
} }
class UserApi(baseUrl: String) { class UserApi(baseUrl: String) {
@ -36,13 +35,13 @@ class UserApi(baseUrl: String) {
* @param user Created user object * @param user Created user object
*/ */
def createUser(apiKey: String)(user: User def createUser(apiKey: String)(user: User
): Request[Either[Either[String, String], Unit], Any] = ): Request[Either[ResponseException[String, Exception], Unit], Any] =
basicRequest basicRequest
.method(Method.POST, uri"$baseUrl/user") .method(Method.POST, uri"$baseUrl/user")
.contentType("application/json") .contentType("application/json")
.header("api_key", apiKey) .header("api_key", apiKey)
.body(user) .body(user)
.response(asEither(asString, ignore)) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
/** /**
* *
@ -56,13 +55,13 @@ class UserApi(baseUrl: String) {
* @param user List of user object * @param user List of user object
*/ */
def createUsersWithArrayInput(apiKey: String)(user: Seq[User] def createUsersWithArrayInput(apiKey: String)(user: Seq[User]
): Request[Either[Either[String, String], Unit], Any] = ): Request[Either[ResponseException[String, Exception], Unit], Any] =
basicRequest basicRequest
.method(Method.POST, uri"$baseUrl/user/createWithArray") .method(Method.POST, uri"$baseUrl/user/createWithArray")
.contentType("application/json") .contentType("application/json")
.header("api_key", apiKey) .header("api_key", apiKey)
.body(user) .body(user)
.response(asEither(asString, ignore)) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
/** /**
* *
@ -76,13 +75,13 @@ class UserApi(baseUrl: String) {
* @param user List of user object * @param user List of user object
*/ */
def createUsersWithListInput(apiKey: String)(user: Seq[User] def createUsersWithListInput(apiKey: String)(user: Seq[User]
): Request[Either[Either[String, String], Unit], Any] = ): Request[Either[ResponseException[String, Exception], Unit], Any] =
basicRequest basicRequest
.method(Method.POST, uri"$baseUrl/user/createWithList") .method(Method.POST, uri"$baseUrl/user/createWithList")
.contentType("application/json") .contentType("application/json")
.header("api_key", apiKey) .header("api_key", apiKey)
.body(user) .body(user)
.response(asEither(asString, ignore)) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
/** /**
* This can only be done by the logged in user. * This can only be done by the logged in user.
@ -102,7 +101,7 @@ class UserApi(baseUrl: String) {
.method(Method.DELETE, uri"$baseUrl/user/${username}") .method(Method.DELETE, uri"$baseUrl/user/${username}")
.contentType("application/json") .contentType("application/json")
.header("api_key", apiKey) .header("api_key", apiKey)
.response(asJson[Unit]) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
/** /**
* *
@ -152,12 +151,12 @@ class UserApi(baseUrl: String) {
* api_key (apiKey) * api_key (apiKey)
*/ */
def logoutUser(apiKey: String)( def logoutUser(apiKey: String)(
): Request[Either[Either[String, String], Unit], Any] = ): Request[Either[ResponseException[String, Exception], Unit], Any] =
basicRequest basicRequest
.method(Method.GET, uri"$baseUrl/user/logout") .method(Method.GET, uri"$baseUrl/user/logout")
.contentType("application/json") .contentType("application/json")
.header("api_key", apiKey) .header("api_key", apiKey)
.response(asEither(asString, ignore)) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
/** /**
* This can only be done by the logged in user. * This can only be done by the logged in user.
@ -179,6 +178,6 @@ class UserApi(baseUrl: String) {
.contentType("application/json") .contentType("application/json")
.header("api_key", apiKey) .header("api_key", apiKey)
.body(user) .body(user)
.response(asJson[Unit]) .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
} }