From cf152acf1b178b54c62be865407b51ac015f3886 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Mon, 10 Mar 2025 16:06:48 +0900 Subject: [PATCH] =?UTF-8?q?setHeaders(..)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/foundation/web/WebClient.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/cokr/xit/foundation/web/WebClient.java b/src/main/java/cokr/xit/foundation/web/WebClient.java index 71f96ac..a9d11a8 100644 --- a/src/main/java/cokr/xit/foundation/web/WebClient.java +++ b/src/main/java/cokr/xit/foundation/web/WebClient.java @@ -227,14 +227,17 @@ public class WebClient extends AbstractComponent { private HttpResponse handleRequest(boolean async, HttpRequest hreq, HttpResponse.BodyHandler bodyHandler, Consumer> respHandler) throws Exception { log().debug("Sending request:\n{} {}", hreq.method(), hreq.uri()); + if (!async) { HttpResponse resp = client().send(hreq, bodyHandler); log().debug("{} response received", resp.statusCode()); + resp.headers().map().forEach((k, v) -> log().debug("{} = {}", k, v)); return resp; } else { CompletableFuture> future = client().sendAsync(hreq, bodyHandler); future.thenApply(resp -> { log().debug("{} response received", resp.statusCode()); + resp.headers().map().forEach((k, v) -> log().debug("{} = {}", k, v)); respHandler.accept(resp); return resp; }); @@ -559,12 +562,20 @@ public class WebClient extends AbstractComponent { HttpRequest.Builder builder = HttpRequest.newBuilder(URI.create(uri + queryString)) .GET(); - if (headers != null) - headers.forEach((k, v) -> builder.header(k, v)); + setHeaders(builder); return builder.build(); } + private void setHeaders(HttpRequest.Builder builder) { + if (isEmpty(headers)) return; + + headers.forEach((k, v) -> { + builder.header(k, v); + log(Request.class).debug("{} = {}", k, v); + }); + } + private String getParams() { if (keyValues == null) return ""; @@ -593,11 +604,9 @@ public class WebClient extends AbstractComponent { HttpRequest post() { try { - HttpRequest.Builder builder = HttpRequest.newBuilder(URI.create(uri)); - builder.POST(bodyPublisher(contentType())); - - if (headers != null) - headers.forEach((k, v) -> builder.header(k, v)); + HttpRequest.Builder builder = HttpRequest.newBuilder(URI.create(uri)) + .POST(bodyPublisher(contentType())); + setHeaders(builder); return builder.build(); } catch (Exception e) { @@ -640,7 +649,6 @@ public class WebClient extends AbstractComponent { } byteList.add(line("--" + boundary + "--")); byteList.add(line("")); -// byteList.forEach(bytes -> System.out.print(new String(bytes))); return BodyPublishers.ofByteArrays(byteList); }