From 9cf25ed45c26cac317143f85a584bb0411087d8d Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Fri, 28 Mar 2025 16:47:06 -0500 Subject: [PATCH] codereview feedback --- qqq-backend-core/src/main/resources/log4j2.xml | 2 +- .../module/api/actions/QHttpResponse.java | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/qqq-backend-core/src/main/resources/log4j2.xml b/qqq-backend-core/src/main/resources/log4j2.xml index 83f6782c..df03564e 100644 --- a/qqq-backend-core/src/main/resources/log4j2.xml +++ b/qqq-backend-core/src/main/resources/log4j2.xml @@ -26,7 +26,7 @@ - + diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/QHttpResponse.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/QHttpResponse.java index 0b100e1e..72069b3e 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/QHttpResponse.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/QHttpResponse.java @@ -60,18 +60,16 @@ public class QHttpResponse *******************************************************************************/ public QHttpResponse(HttpResponse httpResponse, boolean readContentAsBytes) throws Exception { - setGeneralHttpResponseData(httpResponse); + if(!readContentAsBytes) + { + new QHttpResponse(httpResponse); + return; + } + setGeneralHttpResponseData(httpResponse); if(this.statusCode == null || this.statusCode != 204) { - if(readContentAsBytes) - { - this.contentBytes = httpResponse.getEntity().getContent().readAllBytes(); - } - else - { - this.content = EntityUtils.toString(httpResponse.getEntity()); - } + this.contentBytes = httpResponse.getEntity().getContent().readAllBytes(); } } @@ -84,7 +82,6 @@ public class QHttpResponse public QHttpResponse(HttpResponse httpResponse) throws Exception { setGeneralHttpResponseData(httpResponse); - if(this.statusCode == null || this.statusCode != 204) { this.content = EntityUtils.toString(httpResponse.getEntity());