Skip to content
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

Jump to bottom

scala-sttp4: fix for issue 15785 api returns unit. #18536

Merged
merged 1 commit into from
May 1, 2024
Merged

scala-sttp4: fix for issue 15785 api returns unit. #18536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/scala-sttp4/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class {{classname}}(baseUrl: String) {
{{#javadocRenderer}}
{{>javadoc}}
{{/javadocRenderer}}
def {{operationId}}({{>methodParameters}}): Request[{{#defaultReturnType}}Either[Either[String, String], Unit]{{/defaultReturnType}}{{^defaultReturnType}}{{#separateErrorChannel}}Either[ResponseException[String, Exception], {{>operationReturnType}}]{{/separateErrorChannel}}{{^separateErrorChannel}}{{>operationReturnType}}{{/separateErrorChannel}}{{/defaultReturnType}}] =
def {{operationId}}({{>methodParameters}}): Request[{{#separateErrorChannel}}Either[ResponseException[String, Exception], {{>operationReturnType}}]{{/separateErrorChannel}}{{^separateErrorChannel}}{{>operationReturnType}}{{/separateErrorChannel}}] =
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}}")
.contentType({{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{^consumes}}"application/json"{{/consumes}}){{#headerParams}}
Expand All @@ -35,7 +35,7 @@ class {{classname}}(baseUrl: String) {
{{>paramMultipartCreation}}{{^-last}}, {{/-last}}{{/formParams}}
).flatten){{/isMultipart}}{{/formParams.0}}{{#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}}
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/scala-sttp4/src/main/scala/org/openapitools/client/api/PetApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class PetApi(baseUrl: String) {
.method(Method.DELETE, uri"$baseUrl/pet/${petId}")
.contentType("application/json")
.header("api_key", apiKey.toString)
.response(asJson[Unit])
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

/**
* Multiple status values can be provided with comma separated strings
Expand Down Expand Up @@ -142,7 +142,7 @@ class PetApi(baseUrl: String) {
"name" -> name,
"status" -> status
))
.response(asJson[Unit])
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

/**
*
Expand Down
2 changes: 1 addition & 1 deletion ...les/client/petstore/scala-sttp4/src/main/scala/org/openapitools/client/api/StoreApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class StoreApi(baseUrl: String) {
basicRequest
.method(Method.DELETE, uri"$baseUrl/store/order/${orderId}")
.contentType("application/json")
.response(asJson[Unit])
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

/**
* Returns a map of status codes to quantities
Expand Down
20 changes: 10 additions & 10 deletions samples/client/petstore/scala-sttp4/src/main/scala/org/openapitools/client/api/UserApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ class UserApi(baseUrl: String) {
*
* @param user Created user object
*/
def createUser(apiKey: String)(user: User): Request[Either[Either[String, String], Unit]] =
def createUser(apiKey: String)(user: User): Request[Either[ResponseException[String, Exception], Unit]] =
basicRequest
.method(Method.POST, uri"$baseUrl/user")
.contentType("application/json")
.header("api_key", apiKey)
.body(user)
.response(asEither(asString, ignore))
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

/**
*
Expand All @@ -53,13 +53,13 @@ class UserApi(baseUrl: String) {
*
* @param user List of user object
*/
def createUsersWithArrayInput(apiKey: String)(user: Seq[User]): Request[Either[Either[String, String], Unit]] =
def createUsersWithArrayInput(apiKey: String)(user: Seq[User]): Request[Either[ResponseException[String, Exception], Unit]] =
basicRequest
.method(Method.POST, uri"$baseUrl/user/createWithArray")
.contentType("application/json")
.header("api_key", apiKey)
.body(user)
.response(asEither(asString, ignore))
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

/**
*
Expand All @@ -72,13 +72,13 @@ class UserApi(baseUrl: String) {
*
* @param user List of user object
*/
def createUsersWithListInput(apiKey: String)(user: Seq[User]): Request[Either[Either[String, String], Unit]] =
def createUsersWithListInput(apiKey: String)(user: Seq[User]): Request[Either[ResponseException[String, Exception], Unit]] =
basicRequest
.method(Method.POST, uri"$baseUrl/user/createWithList")
.contentType("application/json")
.header("api_key", apiKey)
.body(user)
.response(asEither(asString, ignore))
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

/**
* This can only be done by the logged in user.
Expand All @@ -97,7 +97,7 @@ class UserApi(baseUrl: String) {
.method(Method.DELETE, uri"$baseUrl/user/${username}")
.contentType("application/json")
.header("api_key", apiKey)
.response(asJson[Unit])
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

/**
*
Expand Down Expand Up @@ -144,12 +144,12 @@ class UserApi(baseUrl: String) {
* Available security schemes:
* api_key (apiKey)
*/
def logoutUser(apiKey: String)(): Request[Either[Either[String, String], Unit]] =
def logoutUser(apiKey: String)(): Request[Either[ResponseException[String, Exception], Unit]] =
basicRequest
.method(Method.GET, uri"$baseUrl/user/logout")
.contentType("application/json")
.header("api_key", apiKey)
.response(asEither(asString, ignore))
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

/**
* This can only be done by the logged in user.
Expand All @@ -170,6 +170,6 @@ class UserApi(baseUrl: String) {
.contentType("application/json")
.header("api_key", apiKey)
.body(user)
.response(asJson[Unit])
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))

}
Loading