This is an automated email from the ASF dual-hosted git repository.
peeyush pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 201d2f5cf9 [NO ISSUE][API] add retriable flag only when error/warning
is retriable
201d2f5cf9 is described below
commit 201d2f5cf96c974ff5bc28581908e7084198a0d1
Author: Peeyush Gupta <[email protected]>
AuthorDate: Thu Jun 6 13:18:01 2024 -0700
[NO ISSUE][API] add retriable flag only when error/warning is retriable
Change-Id: I9d63e30cd25e80dc7b7f2cab5be23f1b0472c41d
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18346
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Reviewed-by: Peeyush Gupta <[email protected]>
Reviewed-by: Murtadha Hubail <[email protected]>
---
.../app/result/fields/AbstractCodedMessagePrinter.java | 15 +++++++++++----
.../request-param-validation-400-BAD.01.regexjson | 2 +-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/fields/AbstractCodedMessagePrinter.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/fields/AbstractCodedMessagePrinter.java
index bbeb81c6f3..6564e54778 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/fields/AbstractCodedMessagePrinter.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/fields/AbstractCodedMessagePrinter.java
@@ -63,9 +63,14 @@ public abstract class AbstractCodedMessagePrinter implements
IResponseFieldPrint
pw.print("{ \n\t");
ResultUtil.printField(pw, CodedMessageField.CODE.str(),
codedMessage.getCode());
pw.print("\t");
- ResultUtil.printField(pw, CodedMessageField.MSG.str(),
JSONUtil.escape(codedMessage.getMessage()));
- pw.print("\t");
- ResultUtil.printField(pw, CodedMessageField.RETRIABLE.str(),
codedMessage.isRetriable(), false);
+ if (codedMessage.isRetriable()) {
+ ResultUtil.printField(pw, CodedMessageField.MSG.str(),
JSONUtil.escape(codedMessage.getMessage()));
+ pw.print("\t");
+ ResultUtil.printField(pw, CodedMessageField.RETRIABLE.str(),
codedMessage.isRetriable(), false);
+ } else {
+ ResultUtil.printField(pw, CodedMessageField.MSG.str(),
JSONUtil.escape(codedMessage.getMessage()),
+ false);
+ }
pw.print("\t} \n\t");
boolean lastMsg = i == messages.size() - 1;
if (!lastMsg) {
@@ -81,7 +86,9 @@ public abstract class AbstractCodedMessagePrinter implements
IResponseFieldPrint
ObjectNode error = array.addObject();
error.put(CodedMessageField.CODE.str(), codedMessage.getCode());
error.put(CodedMessageField.MSG.str(), codedMessage.getMessage());
- error.put(CodedMessageField.RETRIABLE.str(),
codedMessage.isRetriable());
+ if (codedMessage.isRetriable()) {
+ error.put(CodedMessageField.RETRIABLE.str(),
codedMessage.isRetriable());
+ }
});
return objectNode;
}
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/request-param-validation-400-BAD/request-param-validation-400-BAD.01.regexjson
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/request-param-validation-400-BAD/request-param-validation-400-BAD.01.regexjson
index f823ff8f43..ba3c97068c 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/request-param-validation-400-BAD/request-param-validation-400-BAD.01.regexjson
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/request-param-validation-400-BAD/request-param-validation-400-BAD.01.regexjson
@@ -1,6 +1,6 @@
{
"errors": [{
- "code": 1, "msg": "ASX0047: Invalid value for
parameter 'format': foo", "retriable": false }
+ "code": 1, "msg": "ASX0047: Invalid value for
parameter 'format': foo" }
],
"status": "fatal",
"metrics": {
