You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ad...@apache.org on 2023/09/15 06:01:07 UTC
[fineract] branch develop updated: FINERACT-1975: BatchAPI - JSON handler cannot handle null (fix)
This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 8eecb866c FINERACT-1975: BatchAPI - JSON handler cannot handle null (fix)
8eecb866c is described below
commit 8eecb866c83d26c99170090eb3e56cdbc346a7ea
Author: Adam Saghy <ad...@gmail.com>
AuthorDate: Thu Sep 14 14:52:09 2023 +0200
FINERACT-1975: BatchAPI - JSON handler cannot handle null (fix)
---
.../java/org/apache/fineract/batch/service/ResolutionHelper.java | 3 +++
.../org/apache/fineract/integrationtests/common/BatchHelper.java | 5 ++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fineract-core/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java b/fineract-core/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
index a14a0e8db..98158890a 100644
--- a/fineract-core/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
+++ b/fineract-core/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
@@ -182,6 +182,9 @@ public class ResolutionHelper {
} else if (element.isJsonArray()) {
final JsonArray jsElementArray = element.getAsJsonArray();
value = processJsonArray(jsElementArray, responseCtx);
+ } else if (element.isJsonNull()) {
+ // No further processing of null values
+ value = element;
} else {
value = resolveDependentVariable(element, responseCtx);
}
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java
index 0324acec8..2970ac999 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java
@@ -820,9 +820,8 @@ public final class BatchHelper {
br.setRelativeUrl(String.format("v1/loans/$.loanId/transactions?command=%s", transactionCommand));
br.setMethod("POST");
String dateString = date.format(DateTimeFormatter.ofPattern("dd MMMM yyyy"));
- br.setBody(String.format(
- "{\"locale\": \"en\", \"dateFormat\": \"dd MMMM yyyy\", " + "\"transactionDate\": \"%s\", \"transactionAmount\": %s}",
- dateString, amount));
+ br.setBody(String.format("{\"locale\": \"en\", \"dateFormat\": \"dd MMMM yyyy\", "
+ + "\"transactionDate\": \"%s\", \"transactionAmount\": %s, \"note\":null}", dateString, amount));
return br;
}