From 1ff54f4e748567b62213bb1a9171aac0a11e0557 Mon Sep 17 00:00:00 2001 From: "danish.amjad" Date: Thu, 16 May 2024 16:09:42 +0200 Subject: [PATCH 1/2] Fix download content from bytes to string. --- .../scala/dev/zio/quickstart/download/DownloadRoutes.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zio-quickstart-restful-webservice/src/main/scala/dev/zio/quickstart/download/DownloadRoutes.scala b/zio-quickstart-restful-webservice/src/main/scala/dev/zio/quickstart/download/DownloadRoutes.scala index fc1dacf..d451752 100644 --- a/zio-quickstart-restful-webservice/src/main/scala/dev/zio/quickstart/download/DownloadRoutes.scala +++ b/zio-quickstart-restful-webservice/src/main/scala/dev/zio/quickstart/download/DownloadRoutes.scala @@ -21,7 +21,7 @@ object DownloadRoutes: Header.ContentType(MediaType.application.`octet-stream`), Header.ContentDisposition.attachment(fileName) ), - body = Body.fromStream(ZStream.fromResource(fileName)) + body = Body.fromStreamChunked(ZStream.fromResource(fileName)) ) }, @@ -35,7 +35,7 @@ object DownloadRoutes: Header.ContentType(MediaType.application.`octet-stream`), Header.ContentDisposition.attachment(file) ), - body = Body.fromStream( + body = Body.fromStreamChunked( ZStream .fromResource(file) .schedule(Schedule.spaced(50.millis)) From 0a038396347e5e94bf1271acc04a2842b429b6f2 Mon Sep 17 00:00:00 2001 From: "danish.amjad" Date: Thu, 16 May 2024 16:10:10 +0200 Subject: [PATCH 2/2] Fix greetings app according to the documentation. --- .../scala/dev/zio/quickstart/greet/GreetingRoutes.scala | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/zio-quickstart-restful-webservice/src/main/scala/dev/zio/quickstart/greet/GreetingRoutes.scala b/zio-quickstart-restful-webservice/src/main/scala/dev/zio/quickstart/greet/GreetingRoutes.scala index b09fafe..ef28416 100644 --- a/zio-quickstart-restful-webservice/src/main/scala/dev/zio/quickstart/greet/GreetingRoutes.scala +++ b/zio-quickstart-restful-webservice/src/main/scala/dev/zio/quickstart/greet/GreetingRoutes.scala @@ -16,16 +16,12 @@ object GreetingRoutes: if (req.url.queryParams.nonEmpty) ZIO.succeed( Response.text( - s"Hello ${req.url.queryParams("name").map(_.mkString(" and "))}!" + s"Hello ${req.url.queryParams("name").reduce((x, y) => x + " and " + y)}!" ) ) else - ZIO.fail(Response.badRequest("The name query parameter is missing!")) + ZIO.succeed(Response.text(s"Hello World!")) }, - - // GET /greet - Method.GET / "greet" -> handler(Response.text(s"Hello World!")), - // GET /greet/:name Method.GET / "greet" / string("name") -> handler { (name: String, _: Request) =>