cask fix for response encoding (#18375)

aaronp · web-flow · commit 24c196800208 · 2024-04-13T09:34:08.000+08:00
diff --git a/modules/openapi-generator/src/main/resources/scala-cask/apiRoutes.mustache b/modules/openapi-generator/src/main/resources/scala-cask/apiRoutes.mustache
@@ -46,16 +46,12 @@ class {{classname}}Routes(service : {{classname}}Service) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-        {{#vendorExtensions.x-has-response-types}}
-            {{#responses}}
-                {{#dataType}}
-                    case Right(value : {{dataType}}) => cask.Response(data = write(value), {{code}}, headers = Seq("Content-Type" -> "application/json"))
-                {{/dataType}}
-            {{/responses}}
-        {{/vendorExtensions.x-has-response-types}}
-        {{^vendorExtensions.x-has-response-types}}
-            case Right(_) => cask.Response("", 200)
-        {{/vendorExtensions.x-has-response-types}}
+        {{#responses}}
+            {{#dataType}}
+          case Right(value : {{dataType}}) => cask.Response(data = write(value), {{code}}, headers = Seq("Content-Type" -> "application/json"))
+            {{/dataType}}
+        {{/responses}}
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
     {{/operation}}
diff --git a/samples/server/petstore/scala-cask/src/main/scala/sample/cask/api/PetRoutes.scala b/samples/server/petstore/scala-cask/src/main/scala/sample/cask/api/PetRoutes.scala
@@ -67,7 +67,8 @@ class PetRoutes(service : PetService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : Pet) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Deletes a pet
@@ -87,7 +88,7 @@ class PetRoutes(service : PetService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Finds Pets by status
@@ -105,7 +106,8 @@ class PetRoutes(service : PetService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : List[Pet]) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Finds Pets by tags
@@ -123,7 +125,8 @@ class PetRoutes(service : PetService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : List[Pet]) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Find pet by ID
@@ -142,7 +145,8 @@ class PetRoutes(service : PetService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : Pet) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Update an existing pet
@@ -162,7 +166,8 @@ class PetRoutes(service : PetService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : Pet) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Updates a pet in the store with form data
@@ -183,7 +188,7 @@ class PetRoutes(service : PetService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** uploads an image
@@ -204,7 +209,8 @@ class PetRoutes(service : PetService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : ApiResponse) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
 
diff --git a/samples/server/petstore/scala-cask/src/main/scala/sample/cask/api/StoreRoutes.scala b/samples/server/petstore/scala-cask/src/main/scala/sample/cask/api/StoreRoutes.scala
@@ -43,7 +43,7 @@ class StoreRoutes(service : StoreService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Returns pet inventories by status
@@ -61,7 +61,8 @@ class StoreRoutes(service : StoreService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : Map[String, Int]) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Find purchase order by ID
@@ -79,7 +80,8 @@ class StoreRoutes(service : StoreService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : Order) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Place an order for a pet
@@ -98,7 +100,8 @@ class StoreRoutes(service : StoreService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : Order) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
 
diff --git a/samples/server/petstore/scala-cask/src/main/scala/sample/cask/api/UserRoutes.scala b/samples/server/petstore/scala-cask/src/main/scala/sample/cask/api/UserRoutes.scala
@@ -56,7 +56,7 @@ class UserRoutes(service : UserService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Creates list of users with given input array
@@ -75,7 +75,7 @@ class UserRoutes(service : UserService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Creates list of users with given input array
@@ -94,7 +94,7 @@ class UserRoutes(service : UserService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Delete user
@@ -113,7 +113,7 @@ class UserRoutes(service : UserService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Get user by user name
@@ -131,7 +131,8 @@ class UserRoutes(service : UserService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : User) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Logs user into the system
@@ -148,7 +149,8 @@ class UserRoutes(service : UserService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(value : String) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Logs out current logged in user session
@@ -166,7 +168,7 @@ class UserRoutes(service : UserService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
         /** Updated user
@@ -187,7 +189,7 @@ class UserRoutes(service : UserService) extends cask.Routes {
 
         result match {
           case Left(error) => cask.Response(error, 500)
-            case Right(_) => cask.Response("", 200)
+          case Right(other) => cask.Response(s"$other", 200)
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ class PetRoutes(service : PetService) extends cask.Routes {`
`67`	`67`
`68`	`68`	`result match {`
`69`	`69`	`case Left(error) => cask.Response(error, 500)`
`70`		`- case Right(_) => cask.Response("", 200)`
	`70`	`+ case Right(value : Pet) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`71`	`+ case Right(other) => cask.Response(s"$other", 200)`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`	`/** Deletes a pet`
`@@ -87,7 +88,7 @@ class PetRoutes(service : PetService) extends cask.Routes {`
`87`	`88`
`88`	`89`	`result match {`
`89`	`90`	`case Left(error) => cask.Response(error, 500)`
`90`		`- case Right(_) => cask.Response("", 200)`
	`91`	`+ case Right(other) => cask.Response(s"$other", 200)`
`91`	`92`	`}`
`92`	`93`	`}`
`93`	`94`	`/** Finds Pets by status`
`@@ -105,7 +106,8 @@ class PetRoutes(service : PetService) extends cask.Routes {`
`105`	`106`
`106`	`107`	`result match {`
`107`	`108`	`case Left(error) => cask.Response(error, 500)`
`108`		`- case Right(_) => cask.Response("", 200)`
	`109`	`+ case Right(value : List[Pet]) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`110`	`+ case Right(other) => cask.Response(s"$other", 200)`
`109`	`111`	`}`
`110`	`112`	`}`
`111`	`113`	`/** Finds Pets by tags`
`@@ -123,7 +125,8 @@ class PetRoutes(service : PetService) extends cask.Routes {`
`123`	`125`
`124`	`126`	`result match {`
`125`	`127`	`case Left(error) => cask.Response(error, 500)`
`126`		`- case Right(_) => cask.Response("", 200)`
	`128`	`+ case Right(value : List[Pet]) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`129`	`+ case Right(other) => cask.Response(s"$other", 200)`
`127`	`130`	`}`
`128`	`131`	`}`
`129`	`132`	`/** Find pet by ID`
`@@ -142,7 +145,8 @@ class PetRoutes(service : PetService) extends cask.Routes {`
`142`	`145`
`143`	`146`	`result match {`
`144`	`147`	`case Left(error) => cask.Response(error, 500)`
`145`		`- case Right(_) => cask.Response("", 200)`
	`148`	`+ case Right(value : Pet) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`149`	`+ case Right(other) => cask.Response(s"$other", 200)`
`146`	`150`	`}`
`147`	`151`	`}`
`148`	`152`	`/** Update an existing pet`
`@@ -162,7 +166,8 @@ class PetRoutes(service : PetService) extends cask.Routes {`
`162`	`166`
`163`	`167`	`result match {`
`164`	`168`	`case Left(error) => cask.Response(error, 500)`
`165`		`- case Right(_) => cask.Response("", 200)`
	`169`	`+ case Right(value : Pet) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`170`	`+ case Right(other) => cask.Response(s"$other", 200)`
`166`	`171`	`}`
`167`	`172`	`}`
`168`	`173`	`/** Updates a pet in the store with form data`
`@@ -183,7 +188,7 @@ class PetRoutes(service : PetService) extends cask.Routes {`
`183`	`188`
`184`	`189`	`result match {`
`185`	`190`	`case Left(error) => cask.Response(error, 500)`
`186`		`- case Right(_) => cask.Response("", 200)`
	`191`	`+ case Right(other) => cask.Response(s"$other", 200)`
`187`	`192`	`}`
`188`	`193`	`}`
`189`	`194`	`/** uploads an image`
`@@ -204,7 +209,8 @@ class PetRoutes(service : PetService) extends cask.Routes {`
`204`	`209`
`205`	`210`	`result match {`
`206`	`211`	`case Left(error) => cask.Response(error, 500)`
`207`		`- case Right(_) => cask.Response("", 200)`
	`212`	`+ case Right(value : ApiResponse) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`213`	`+ case Right(other) => cask.Response(s"$other", 200)`
`208`	`214`	`}`
`209`	`215`	`}`
`210`	`216`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class StoreRoutes(service : StoreService) extends cask.Routes {`
`43`	`43`
`44`	`44`	`result match {`
`45`	`45`	`case Left(error) => cask.Response(error, 500)`
`46`		`- case Right(_) => cask.Response("", 200)`
	`46`	`+ case Right(other) => cask.Response(s"$other", 200)`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`/** Returns pet inventories by status`
`@@ -61,7 +61,8 @@ class StoreRoutes(service : StoreService) extends cask.Routes {`
`61`	`61`
`62`	`62`	`result match {`
`63`	`63`	`case Left(error) => cask.Response(error, 500)`
`64`		`- case Right(_) => cask.Response("", 200)`
	`64`	`+ case Right(value : Map[String, Int]) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`65`	`+ case Right(other) => cask.Response(s"$other", 200)`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`	`/** Find purchase order by ID`
`@@ -79,7 +80,8 @@ class StoreRoutes(service : StoreService) extends cask.Routes {`
`79`	`80`
`80`	`81`	`result match {`
`81`	`82`	`case Left(error) => cask.Response(error, 500)`
`82`		`- case Right(_) => cask.Response("", 200)`
	`83`	`+ case Right(value : Order) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`84`	`+ case Right(other) => cask.Response(s"$other", 200)`
`83`	`85`	`}`
`84`	`86`	`}`
`85`	`87`	`/** Place an order for a pet`
`@@ -98,7 +100,8 @@ class StoreRoutes(service : StoreService) extends cask.Routes {`
`98`	`100`
`99`	`101`	`result match {`
`100`	`102`	`case Left(error) => cask.Response(error, 500)`
`101`		`- case Right(_) => cask.Response("", 200)`
	`103`	`+ case Right(value : Order) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`104`	`+ case Right(other) => cask.Response(s"$other", 200)`
`102`	`105`	`}`
`103`	`106`	`}`
`104`	`107`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class UserRoutes(service : UserService) extends cask.Routes {`
`56`	`56`
`57`	`57`	`result match {`
`58`	`58`	`case Left(error) => cask.Response(error, 500)`
`59`		`- case Right(_) => cask.Response("", 200)`
	`59`	`+ case Right(other) => cask.Response(s"$other", 200)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`/** Creates list of users with given input array`
`@@ -75,7 +75,7 @@ class UserRoutes(service : UserService) extends cask.Routes {`
`75`	`75`
`76`	`76`	`result match {`
`77`	`77`	`case Left(error) => cask.Response(error, 500)`
`78`		`- case Right(_) => cask.Response("", 200)`
	`78`	`+ case Right(other) => cask.Response(s"$other", 200)`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`/** Creates list of users with given input array`
`@@ -94,7 +94,7 @@ class UserRoutes(service : UserService) extends cask.Routes {`
`94`	`94`
`95`	`95`	`result match {`
`96`	`96`	`case Left(error) => cask.Response(error, 500)`
`97`		`- case Right(_) => cask.Response("", 200)`
	`97`	`+ case Right(other) => cask.Response(s"$other", 200)`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`/** Delete user`
`@@ -113,7 +113,7 @@ class UserRoutes(service : UserService) extends cask.Routes {`
`113`	`113`
`114`	`114`	`result match {`
`115`	`115`	`case Left(error) => cask.Response(error, 500)`
`116`		`- case Right(_) => cask.Response("", 200)`
	`116`	`+ case Right(other) => cask.Response(s"$other", 200)`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`/** Get user by user name`
`@@ -131,7 +131,8 @@ class UserRoutes(service : UserService) extends cask.Routes {`
`131`	`131`
`132`	`132`	`result match {`
`133`	`133`	`case Left(error) => cask.Response(error, 500)`
`134`		`- case Right(_) => cask.Response("", 200)`
	`134`	`+ case Right(value : User) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`135`	`+ case Right(other) => cask.Response(s"$other", 200)`
`135`	`136`	`}`
`136`	`137`	`}`
`137`	`138`	`/** Logs user into the system`
`@@ -148,7 +149,8 @@ class UserRoutes(service : UserService) extends cask.Routes {`
`148`	`149`
`149`	`150`	`result match {`
`150`	`151`	`case Left(error) => cask.Response(error, 500)`
`151`		`- case Right(_) => cask.Response("", 200)`
	`152`	`+ case Right(value : String) => cask.Response(data = write(value), 200, headers = Seq("Content-Type" -> "application/json"))`
	`153`	`+ case Right(other) => cask.Response(s"$other", 200)`
`152`	`154`	`}`
`153`	`155`	`}`
`154`	`156`	`/** Logs out current logged in user session`
`@@ -166,7 +168,7 @@ class UserRoutes(service : UserService) extends cask.Routes {`
`166`	`168`
`167`	`169`	`result match {`
`168`	`170`	`case Left(error) => cask.Response(error, 500)`
`169`		`- case Right(_) => cask.Response("", 200)`
	`171`	`+ case Right(other) => cask.Response(s"$other", 200)`
`170`	`172`	`}`
`171`	`173`	`}`
`172`	`174`	`/** Updated user`
`@@ -187,7 +189,7 @@ class UserRoutes(service : UserService) extends cask.Routes {`
`187`	`189`
`188`	`190`	`result match {`
`189`	`191`	`case Left(error) => cask.Response(error, 500)`
`190`		`- case Right(_) => cask.Response("", 200)`
	`192`	`+ case Right(other) => cask.Response(s"$other", 200)`
`191`	`193`	`}`
`192`	`194`	`}`
`193`	`195`