QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/api-request-updates' into integration

Browse Source
This commit is contained in:
Tim Chamberlain
2025-04-01 10:45:46 -05:00
parent cd733c386c 9cf25ed45c
commit 13813b6f9d
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qqq-backend-core/src/main/resources/log4j2.xml
View File

@ -26,7 +26,7 @@
<Logger name="org.quartz" level="INFO" /> <Logger name="org.quartz" level="INFO" />
<Logger name="liquibase" level="INFO" /> <Logger name="liquibase" level="INFO" />
<Logger name="com.amazonaws" level="INFO" /> <Logger name="com.amazonaws" level="INFO" />
<Root level="All"> <Root level="all">
<AppenderRef ref="SystemOutAppender"/> <AppenderRef ref="SystemOutAppender"/>
<AppenderRef ref="SyslogAppender"/> <AppenderRef ref="SyslogAppender"/>
<!-- <AppenderRef ref="LogFileAppender"/> --> <!-- <AppenderRef ref="LogFileAppender"/> -->

17
qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/QHttpResponse.java
View File

@ -60,18 +60,16 @@ public class QHttpResponse
*******************************************************************************/ *******************************************************************************/
public QHttpResponse(HttpResponse httpResponse, boolean readContentAsBytes) throws Exception 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(this.statusCode == null || this.statusCode != 204)
{ {
if(readContentAsBytes) this.contentBytes = httpResponse.getEntity().getContent().readAllBytes();
{
this.contentBytes = httpResponse.getEntity().getContent().readAllBytes();
}
else
{
this.content = EntityUtils.toString(httpResponse.getEntity());
}
} }
} }
@ -84,7 +82,6 @@ public class QHttpResponse
public QHttpResponse(HttpResponse httpResponse) throws Exception public QHttpResponse(HttpResponse httpResponse) throws Exception
{ {
setGeneralHttpResponseData(httpResponse); setGeneralHttpResponseData(httpResponse);
if(this.statusCode == null || this.statusCode != 204) if(this.statusCode == null || this.statusCode != 204)
{ {
this.content = EntityUtils.toString(httpResponse.getEntity()); this.content = EntityUtils.toString(httpResponse.getEntity());