From e8c7b44e8ec8a15297af85b131aa29cad3979b6b Mon Sep 17 00:00:00 2001 From: bopol Date: Fri, 5 Feb 2021 18:22:08 +0100 Subject: [PATCH] Use HttpHeaderNames for HTTP headers --- src/main/java/me/kavin/piped/Main.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/kavin/piped/Main.java b/src/main/java/me/kavin/piped/Main.java index 1cb0545..a5cb610 100644 --- a/src/main/java/me/kavin/piped/Main.java +++ b/src/main/java/me/kavin/piped/Main.java @@ -20,6 +20,10 @@ import reactor.netty.NettyOutbound; import reactor.netty.http.server.HttpServer; import reactor.netty.http.server.HttpServerResponse; +import java.nio.charset.StandardCharsets; + +import static io.netty.handler.codec.http.HttpHeaderNames.*; + public class Main { public static void main(String[] args) throws Exception { @@ -219,20 +223,17 @@ public class Main { } public static NettyOutbound writeResponse(HttpServerResponse res, String resp, int code, String cache, long time) { - return res.compression(true).addHeader("Access-Control-Allow-Origin", "*").addHeader("Cache-Control", cache) - .addHeader("Server-Timing", "app;dur=" + (System.nanoTime() - time) / 1000000.0) - .send(ByteBufFlux.fromString(Flux.just(resp), java.nio.charset.StandardCharsets.UTF_8, - ByteBufAllocator.DEFAULT)); + return writeResponse(res, resp.getBytes(StandardCharsets.UTF_8), code, cache, time); } public static NettyOutbound writeResponse(HttpServerResponse res, byte[] resp, int code, String cache, long time) { - return res.compression(true).addHeader("Access-Control-Allow-Origin", "*").addHeader("Cache-Control", cache) + return res.compression(true).addHeader(ACCESS_CONTROL_ALLOW_ORIGIN, "*").addHeader(CACHE_CONTROL, cache) .addHeader("Server-Timing", "app;dur=" + (System.nanoTime() - time) / 1000000.0) .sendByteArray(Flux.just(resp)); } public static NettyOutbound writeResponse(HttpServerResponse res, Flux resp, int code, String cache) { - return res.compression(true).addHeader("Access-Control-Allow-Origin", "*").addHeader("Cache-Control", cache) + return res.compression(true).addHeader(ACCESS_CONTROL_ALLOW_ORIGIN, "*").addHeader(CACHE_CONTROL, cache) .send(ByteBufFlux.fromString(resp, java.nio.charset.StandardCharsets.UTF_8, ByteBufAllocator.DEFAULT)); } }