Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] ServiceResult.toJson() also checks if ex has I18n

This commit is contained in:
Robert von Burg 2021-04-22 16:34:03 +02:00
parent 523d1372c1
commit 92143b9154
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResult.java
View File

@ -22,6 +22,7 @@ import static li.strolch.utils.helper.StringHelper.isEmpty;
import java.util.ResourceBundle;
import com.google.gson.JsonObject;
import li.strolch.exception.StrolchException;
import li.strolch.model.i18n.I18nMessageToJsonVisitor;
import li.strolch.utils.I18nMessage;
@ -200,9 +201,12 @@ public class ServiceResult {
if (this.throwable != null) {
json.addProperty("exceptionMsg", getExceptionMessageWithCauses(this.throwable, false));
json.addProperty("throwable", formatException(this.throwable));
if (this.throwable instanceof StrolchException && ((StrolchException) this.throwable).hasI18n())
json.add("i18n", ((StrolchException) this.throwable).getI18n().accept(new I18nMessageToJsonVisitor()));
}
if (this.i18nMessage != null)
if (!json.has("i18n") && this.i18nMessage != null)
json.add("i18n", this.i18nMessage.accept(new I18nMessageToJsonVisitor()));
return json;