From 8f6e4144d244140ee0a100177478f0da0c41e290 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Wed, 12 Apr 2023 11:20:12 -0500 Subject: [PATCH] Change to use getTableWrapperObjectName in places it was intended (e.g., within JSON objects), instead of getTablePath(meant for URLs) --- .../module/api/actions/BaseAPIActionUtil.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java index 175c59b8..0a8e705b 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java @@ -447,11 +447,11 @@ public class BaseAPIActionUtil } else { - String tablePath = getBackendDetails(table).getTablePath(); + String wrapperObjectName = getBackendDetails(table).getTableWrapperObjectName(); jsonObject = JsonUtils.toJSONObject(resultString); - if(jsonObject.has(tablePath)) + if(jsonObject.has(wrapperObjectName)) { - Object o = jsonObject.get(tablePath); + Object o = jsonObject.get(wrapperObjectName); if(o instanceof JSONArray jsonArray) { resultList = jsonArray; @@ -463,7 +463,7 @@ public class BaseAPIActionUtil } else { - throw (new QException("Unrecognized object until tablePath: " + o)); + throw (new QException("Unrecognized object until wrapperObjectName: " + o)); } } } @@ -731,11 +731,11 @@ public class BaseAPIActionUtil JSONObject body = recordToJsonObject(table, record); String json = body.toString(); - String tablePath = getBackendDetails(table).getTablePath(); - if(tablePath != null) + String wrapperObjectName = getBackendDetails(table).getTableWrapperObjectName(); + if(wrapperObjectName != null) { body = new JSONObject(); - body.put(tablePath, new JSONObject(json)); + body.put(wrapperObjectName, new JSONObject(json)); json = body.toString(); } return (new StringEntity(json)); @@ -759,12 +759,12 @@ public class BaseAPIActionUtil entityListJson.put(entityListJson.length(), recordToJsonObject(table, record)); } - String json = entityListJson.toString(); - String tablePath = getBackendDetails(table).getTablePath(); - if(tablePath != null) + String json = entityListJson.toString(); + String wrapperObjectName = getBackendDetails(table).getTableWrapperObjectName(); + if(wrapperObjectName != null) { JSONObject body = new JSONObject(); - body.put(tablePath, new JSONArray(json)); + body.put(wrapperObjectName, new JSONArray(json)); json = body.toString(); } return (new StringEntity(json)); @@ -848,7 +848,7 @@ public class BaseAPIActionUtil /******************************************************************************* ** *******************************************************************************/ - protected QHttpResponse makeRequest(QTableMetaData table, HttpRequestBase request) throws QException + public QHttpResponse makeRequest(QTableMetaData table, HttpRequestBase request) throws QException { int sleepMillis = getInitialRateLimitBackoffMillis(); int rateLimitsCaught = 0;