refactor(Http): update example and ServerRequestHandler

zio · Apr 18, 2021 · 789314e · 789314e
1 parent 040ec94
commit 789314e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/example/src/main/scala/WebSocketAdvanced.scala b/example/src/main/scala/WebSocketAdvanced.scala
@@ -34,7 +34,10 @@ object WebSocketAdvanced extends App {
         Response.http(
           status = Status.OK,
           content = HttpContent.Chunked(
-            ZStream.repeat(Chunk("Hello world !")).schedule(Schedule.spaced(1 microsecond)).take(2000000),
+            ZStream
+              .repeat(Chunk.fromArray("Hello world !".getBytes(HTTP_CHARSET)))
+              .schedule(Schedule.spaced(1 microsecond))
+              .take(2000000),
           ),
         )
     }

diff --git a/zio-http/src/main/scala/zhttp/service/server/ServerRequestHandler.scala b/zio-http/src/main/scala/zhttp/service/server/ServerRequestHandler.scala
@@ -78,16 +78,7 @@ final case class ServerRequestHandler[R](
             releaseOrIgnore(jReq)
             executeAsync2(
               ctx, {
-                data
-                  .map(t =>
-                    t.map(x => {
-                      Unpooled.copiedBuffer(x, HTTP_CHARSET)
-                    }).map(x => {
-                      ctx.writeAndFlush(x)
-                      ()
-                    }),
-                  )
-                  .runDrain
+                data.map(t => ctx.writeAndFlush(Unpooled.copiedBuffer(t.toArray))).runDrain
               } *> ChannelFuture.unit(ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)),
             )