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

sprint-14: initial checkin of basepull capability on processes

Browse Source
This commit is contained in:
Tim Chamberlain
2022-10-24 17:06:11 -05:00
parent 44537e182d
commit 128c379f10
11 changed files with 658 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APICountAction.java
View File

@ -61,8 +61,9 @@ public class APICountAction extends AbstractAPIAction implements CountInterface
HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
HttpClient client = httpClientBuilder.build();
String url = apiActionUtil.buildTableUrl(table);
HttpGet request = new HttpGet(url + paramString);
String url = apiActionUtil.buildTableUrl(table) + paramString;
LOG.info("API URL: " + url);
HttpGet request = new HttpGet(url);
apiActionUtil.setupAuthorizationInRequest(request);
apiActionUtil.setupContentTypeInRequest(request);

5
qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APIQueryAction.java
View File

@ -63,10 +63,9 @@ public class APIQueryAction extends AbstractAPIAction implements QueryInterface
HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
HttpClient client = httpClientBuilder.build();
String url = apiActionUtil.buildTableUrl(table) + paramString;
HttpGet request = new HttpGet(url);
String url = apiActionUtil.buildTableUrl(table) + paramString;
LOG.info("API URL: " + url);
HttpGet request = new HttpGet(url);
apiActionUtil.setupAuthorizationInRequest(request);
apiActionUtil.setupContentTypeInRequest(request);

2
qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java
View File

@ -281,7 +281,7 @@ public class BaseAPIActionUtil
String resultString = EntityUtils.toString(entity);
List<QRecord> recordList = new ArrayList<>();
if(StringUtils.hasContent(resultString))
if(StringUtils.hasContent(resultString) && !resultString.equals("null"))
{
JSONArray resultList = null;
JSONObject jsonObject = null;