Skip to content

Commit bd2a4bd

Browse files
plaflammeplaflamme
committed
fix: remove unecessary whitespaces
1 parent 9b9f05e commit bd2a4bd

6 files changed

Lines changed: 38 additions & 40 deletions

File tree

‎modules/openapi-generator/src/main/resources/scala-sttp4/model.mustache‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ case class {{classname}}(
4141
object {{classname}} {
4242
{{#json4s}}
4343
import org.json4s._
44-
44+
4545
{{^vendorExtensions.x-use-discr}}
4646
// oneOf without discriminator - json4s custom serializer
4747
implicit object {{classname}}Serializer extends Serializer[{{classname}}] {
@@ -91,7 +91,7 @@ object {{classname}} {
9191
import io.circe.{Encoder, Decoder}
9292
import io.circe.generic.semiauto._
9393
import io.circe.generic.auto._
94-
94+
9595
implicit val encoder: Encoder[{{classname}}] = deriveEncoder
9696
implicit val decoder: Decoder[{{classname}}] = deriveDecoder
9797
{{/vendorExtensions.x-use-discr}}
@@ -101,7 +101,7 @@ object {{classname}} {
101101
import io.circe.generic.extras._
102102
import io.circe.generic.extras.semiauto._
103103
import io.circe.generic.auto._
104-
104+
105105
private implicit val config: Configuration = Configuration.default.withDiscriminator("{{discriminator.propertyName}}")
106106
.copy(
107107
transformConstructorNames = {
@@ -128,15 +128,15 @@ object {{classname}} {
128128

129129
{{#circe}}
130130
import io.circe.{Encoder, Decoder}
131-
131+
132132
implicit val encoder: Encoder[{{classname}}] = Encoder.encodeString.contramap[{{classname}}] {
133133
{{#allowableValues}}
134134
{{#values}}
135135
case {{#fnEnumEntry}}{{.}}{{/fnEnumEntry}} => "{{.}}"
136136
{{/values}}
137137
{{/allowableValues}}
138138
}
139-
139+
140140
implicit val decoder: Decoder[{{classname}}] = Decoder.decodeString.emap {
141141
{{#allowableValues}}
142142
{{#values}}
@@ -148,7 +148,7 @@ object {{classname}} {
148148
{{/circe}}
149149
{{#json4s}}
150150
import org.json4s._
151-
151+
152152
implicit object {{classname}}Serializer extends Serializer[{{classname}}] {
153153
def deserialize(implicit format: Formats): PartialFunction[(TypeInfo, JValue), {{classname}}] = {
154154
case (TypeInfo(clazz, _), json) if classOf[{{classname}}].isAssignableFrom(clazz) =>
@@ -188,7 +188,7 @@ case class {{classname}}(
188188
object {{classname}}Enums {
189189
{{#vars}}
190190
{{#isEnum}}
191-
191+
192192
sealed trait {{datatypeWithEnum}}
193193
object {{datatypeWithEnum}} {
194194
{{#_enum}}
@@ -197,13 +197,13 @@ object {{classname}}Enums {
197197

198198
{{#circe}}
199199
import io.circe.{Encoder, Decoder}
200-
200+
201201
implicit val encoder: Encoder[{{datatypeWithEnum}}] = Encoder.encodeString.contramap[{{datatypeWithEnum}}] {
202202
{{#_enum}}
203203
case {{#fnEnumEntry}}{{.}}{{/fnEnumEntry}} => "{{.}}"
204204
{{/_enum}}
205205
}
206-
206+
207207
implicit val decoder: Decoder[{{datatypeWithEnum}}] = Decoder.decodeString.emap {
208208
{{#_enum}}
209209
case "{{.}}" => Right({{#fnEnumEntry}}{{.}}{{/fnEnumEntry}})
@@ -213,7 +213,7 @@ object {{classname}}Enums {
213213
{{/circe}}
214214
{{#json4s}}
215215
import org.json4s._
216-
216+
217217
implicit object {{datatypeWithEnum}}Serializer extends Serializer[{{datatypeWithEnum}}] {
218218
def deserialize(implicit format: Formats): PartialFunction[(TypeInfo, JValue), {{datatypeWithEnum}}] = {
219219
case (TypeInfo(clazz, _), json) if classOf[{{datatypeWithEnum}}].isAssignableFrom(clazz) =>

‎samples/client/petstore/scala-sttp4/src/main/scala/org/openapitools/client/api/PetApi.scala‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class PetApi(baseUrl: String) {
3333
*
3434
* @param pet Pet object that needs to be added to the store
3535
*/
36-
def addPet(pet: Pet): Request[Either[ResponseException[String, Exception], Pet]] =
36+
def addPet(pet: Pet): Request[Either[ResponseException[String], Pet]] =
3737
basicRequest
3838
.method(Method.POST, uri"$baseUrl/pet")
3939
.contentType("application/json")
40-
.body(pet)
40+
.body(asJson(pet))
4141
.response(asJson[Pet])
4242

4343
/**
@@ -49,11 +49,11 @@ class PetApi(baseUrl: String) {
4949
* @param petId Pet id to delete
5050
* @param apiKey
5151
*/
52-
def deletePet(petId: Long, apiKey: Option[String] = None): Request[Either[ResponseException[String, Exception], Unit]] =
52+
def deletePet(petId: Long, apiKey: Option[String] = None): Request[Either[ResponseException[String], Unit]] =
5353
basicRequest
5454
.method(Method.DELETE, uri"$baseUrl/pet/${petId}")
5555
.contentType("application/json")
56-
.header("api_key", apiKey.toString)
56+
.header("api_key", apiKey)
5757
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
5858

5959
/**
@@ -65,7 +65,7 @@ class PetApi(baseUrl: String) {
6565
*
6666
* @param status Status values that need to be considered for filter
6767
*/
68-
def findPetsByStatus(status: Seq[String]): Request[Either[ResponseException[String, Exception], Seq[Pet]]] =
68+
def findPetsByStatus(status: Seq[String] = Seq.empty): Request[Either[ResponseException[String], Seq[Pet]]] =
6969
basicRequest
7070
.method(Method.GET, uri"$baseUrl/pet/findByStatus?status=${ status }")
7171
.contentType("application/json")
@@ -80,7 +80,7 @@ class PetApi(baseUrl: String) {
8080
*
8181
* @param tags Tags to filter by
8282
*/
83-
def findPetsByTags(tags: Seq[String]): Request[Either[ResponseException[String, Exception], Seq[Pet]]] =
83+
def findPetsByTags(tags: Seq[String] = Seq.empty): Request[Either[ResponseException[String], Seq[Pet]]] =
8484
basicRequest
8585
.method(Method.GET, uri"$baseUrl/pet/findByTags?tags=${ tags }")
8686
.contentType("application/json")
@@ -99,7 +99,7 @@ class PetApi(baseUrl: String) {
9999
*
100100
* @param petId ID of pet to return
101101
*/
102-
def getPetById(apiKeyHeader: String)(petId: Long): Request[Either[ResponseException[String, Exception], Pet]] =
102+
def getPetById(apiKeyHeader: String)(petId: Long): Request[Either[ResponseException[String], Pet]] =
103103
basicRequest
104104
.method(Method.GET, uri"$baseUrl/pet/${petId}")
105105
.contentType("application/json")
@@ -117,11 +117,11 @@ class PetApi(baseUrl: String) {
117117
*
118118
* @param pet Pet object that needs to be added to the store
119119
*/
120-
def updatePet(pet: Pet): Request[Either[ResponseException[String, Exception], Pet]] =
120+
def updatePet(pet: Pet): Request[Either[ResponseException[String], Pet]] =
121121
basicRequest
122122
.method(Method.PUT, uri"$baseUrl/pet")
123123
.contentType("application/json")
124-
.body(pet)
124+
.body(asJson(pet))
125125
.response(asJson[Pet])
126126

127127
/**
@@ -134,7 +134,7 @@ class PetApi(baseUrl: String) {
134134
* @param name Updated name of the pet
135135
* @param status Updated status of the pet
136136
*/
137-
def updatePetWithForm(petId: Long, name: Option[String] = None, status: Option[String] = None): Request[Either[ResponseException[String, Exception], Unit]] =
137+
def updatePetWithForm(petId: Long, name: Option[String] = None, status: Option[String] = None): Request[Either[ResponseException[String], Unit]] =
138138
basicRequest
139139
.method(Method.POST, uri"$baseUrl/pet/${petId}")
140140
.contentType("application/x-www-form-urlencoded")
@@ -154,7 +154,7 @@ class PetApi(baseUrl: String) {
154154
* @param additionalMetadata Additional data to pass to server
155155
* @param file file to upload
156156
*/
157-
def uploadFile(petId: Long, additionalMetadata: Option[String] = None, file: Option[File] = None): Request[Either[ResponseException[String, Exception], ApiResponse]] =
157+
def uploadFile(petId: Long, additionalMetadata: Option[String] = None, file: Option[File] = None): Request[Either[ResponseException[String], ApiResponse]] =
158158
basicRequest
159159
.method(Method.POST, uri"$baseUrl/pet/${petId}/uploadImage")
160160
.contentType("multipart/form-data")

‎samples/client/petstore/scala-sttp4/src/main/scala/org/openapitools/client/api/StoreApi.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class StoreApi(baseUrl: String) {
3131
*
3232
* @param orderId ID of the order that needs to be deleted
3333
*/
34-
def deleteOrder(orderId: String): Request[Either[ResponseException[String, Exception], Unit]] =
34+
def deleteOrder(orderId: String): Request[Either[ResponseException[String], Unit]] =
3535
basicRequest
3636
.method(Method.DELETE, uri"$baseUrl/store/order/${orderId}")
3737
.contentType("application/json")
@@ -46,7 +46,7 @@ class StoreApi(baseUrl: String) {
4646
* Available security schemes:
4747
* api_key (apiKey)
4848
*/
49-
def getInventory(apiKeyHeader: String)(): Request[Either[ResponseException[String, Exception], Map[String, Int]]] =
49+
def getInventory(apiKeyHeader: String)(): Request[Either[ResponseException[String], Map[String, Int]]] =
5050
basicRequest
5151
.method(Method.GET, uri"$baseUrl/store/inventory")
5252
.contentType("application/json")
@@ -63,7 +63,7 @@ class StoreApi(baseUrl: String) {
6363
*
6464
* @param orderId ID of pet that needs to be fetched
6565
*/
66-
def getOrderById(orderId: Long): Request[Either[ResponseException[String, Exception], Order]] =
66+
def getOrderById(orderId: Long): Request[Either[ResponseException[String], Order]] =
6767
basicRequest
6868
.method(Method.GET, uri"$baseUrl/store/order/${orderId}")
6969
.contentType("application/json")
@@ -78,11 +78,11 @@ class StoreApi(baseUrl: String) {
7878
*
7979
* @param order order placed for purchasing the pet
8080
*/
81-
def placeOrder(order: Order): Request[Either[ResponseException[String, Exception], Order]] =
81+
def placeOrder(order: Order): Request[Either[ResponseException[String], Order]] =
8282
basicRequest
8383
.method(Method.POST, uri"$baseUrl/store/order")
8484
.contentType("application/json")
85-
.body(order)
85+
.body(asJson(order))
8686
.response(asJson[Order])
8787

8888
}

‎samples/client/petstore/scala-sttp4/src/main/scala/org/openapitools/client/api/UserApi.scala‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class UserApi(baseUrl: String) {
3434
*
3535
* @param user Created user object
3636
*/
37-
def createUser(apiKeyHeader: String)(user: User): Request[Either[ResponseException[String, Exception], Unit]] =
37+
def createUser(apiKeyHeader: String)(user: User): Request[Either[ResponseException[String], Unit]] =
3838
basicRequest
3939
.method(Method.POST, uri"$baseUrl/user")
4040
.contentType("application/json")
4141
.header("api_key", apiKeyHeader)
42-
.body(user)
42+
.body(asJson(user))
4343
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
4444

4545
/**
@@ -53,12 +53,12 @@ class UserApi(baseUrl: String) {
5353
*
5454
* @param user List of user object
5555
*/
56-
def createUsersWithArrayInput(apiKeyHeader: String)(user: Seq[User]): Request[Either[ResponseException[String, Exception], Unit]] =
56+
def createUsersWithArrayInput(apiKeyHeader: String)(user: Seq[User]): Request[Either[ResponseException[String], Unit]] =
5757
basicRequest
5858
.method(Method.POST, uri"$baseUrl/user/createWithArray")
5959
.contentType("application/json")
6060
.header("api_key", apiKeyHeader)
61-
.body(user)
61+
.body(asJson(user))
6262
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
6363

6464
/**
@@ -72,12 +72,12 @@ class UserApi(baseUrl: String) {
7272
*
7373
* @param user List of user object
7474
*/
75-
def createUsersWithListInput(apiKeyHeader: String)(user: Seq[User]): Request[Either[ResponseException[String, Exception], Unit]] =
75+
def createUsersWithListInput(apiKeyHeader: String)(user: Seq[User]): Request[Either[ResponseException[String], Unit]] =
7676
basicRequest
7777
.method(Method.POST, uri"$baseUrl/user/createWithList")
7878
.contentType("application/json")
7979
.header("api_key", apiKeyHeader)
80-
.body(user)
80+
.body(asJson(user))
8181
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
8282

8383
/**
@@ -92,7 +92,7 @@ class UserApi(baseUrl: String) {
9292
*
9393
* @param username The name that needs to be deleted
9494
*/
95-
def deleteUser(apiKeyHeader: String)(username: String): Request[Either[ResponseException[String, Exception], Unit]] =
95+
def deleteUser(apiKeyHeader: String)(username: String): Request[Either[ResponseException[String], Unit]] =
9696
basicRequest
9797
.method(Method.DELETE, uri"$baseUrl/user/${username}")
9898
.contentType("application/json")
@@ -109,7 +109,7 @@ class UserApi(baseUrl: String) {
109109
*
110110
* @param username The name that needs to be fetched. Use user1 for testing.
111111
*/
112-
def getUserByName(username: String): Request[Either[ResponseException[String, Exception], User]] =
112+
def getUserByName(username: String): Request[Either[ResponseException[String], User]] =
113113
basicRequest
114114
.method(Method.GET, uri"$baseUrl/user/${username}")
115115
.contentType("application/json")
@@ -129,7 +129,7 @@ class UserApi(baseUrl: String) {
129129
* @param username The user name for login
130130
* @param password The password for login in clear text
131131
*/
132-
def loginUser(username: String, password: String): Request[Either[ResponseException[String, Exception], String]] =
132+
def loginUser(username: String, password: String): Request[Either[ResponseException[String], String]] =
133133
basicRequest
134134
.method(Method.GET, uri"$baseUrl/user/login?username=${ username }&password=${ password }")
135135
.contentType("application/json")
@@ -144,7 +144,7 @@ class UserApi(baseUrl: String) {
144144
* Available security schemes:
145145
* api_key (apiKey)
146146
*/
147-
def logoutUser(apiKeyHeader: String)(): Request[Either[ResponseException[String, Exception], Unit]] =
147+
def logoutUser(apiKeyHeader: String)(): Request[Either[ResponseException[String], Unit]] =
148148
basicRequest
149149
.method(Method.GET, uri"$baseUrl/user/logout")
150150
.contentType("application/json")
@@ -164,12 +164,12 @@ class UserApi(baseUrl: String) {
164164
* @param username name that need to be deleted
165165
* @param user Updated user object
166166
*/
167-
def updateUser(apiKeyHeader: String)(username: String, user: User): Request[Either[ResponseException[String, Exception], Unit]] =
167+
def updateUser(apiKeyHeader: String)(username: String, user: User): Request[Either[ResponseException[String], Unit]] =
168168
basicRequest
169169
.method(Method.PUT, uri"$baseUrl/user/${username}")
170170
.contentType("application/json")
171171
.header("api_key", apiKeyHeader)
172-
.body(user)
172+
.body(asJson(user))
173173
.response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
174174

175175
}

‎samples/client/petstore/scala-sttp4/src/main/scala/org/openapitools/client/model/ApiResponse.scala‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ case class ApiResponse(
2121
`type`: Option[String] = None,
2222
message: Option[String] = None
2323
)
24-

‎samples/client/petstore/scala-sttp4/src/main/scala/org/openapitools/client/model/Category.scala‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ case class Category(
2020
id: Option[Long] = None,
2121
name: Option[String] = None
2222
)
23-

0 commit comments

Comments
 (0)