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

[New] ResponseUtil.toResponse now uses ServiceResult.toJson() + i18n part

This commit is contained in:
Robert von Burg 2019-08-27 08:32:57 +02:00
parent 0db98efd9f
commit 198030f130
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
li.strolch.rest/src/main/java/li/strolch/rest/helper/ResponseUtil.java
View File

@ -66,6 +66,17 @@ public class ResponseUtil {
return Response.ok(json, MediaType.APPLICATION_JSON).build();
}
public static Response toResponse(String prop1, String value1, JsonArray data) {
JsonObject response = new JsonObject();
response.addProperty(MSG, StringHelper.DASH);
response.addProperty(prop1, value1);
response.add(DATA, data);
String json = new Gson().toJson(response);
return Response.ok(json, MediaType.APPLICATION_JSON).build();
}
public static <T> Response toResponse(String member, T t, Function<T, JsonObject> toJson) {
return toResponse(member, toJson.apply(t));
}
@ -115,24 +126,8 @@ public class ResponseUtil {
public static Response toResponse(ServiceResult svcResult) {
String msg = StringHelper.DASH;
String exceptionMsg = StringHelper.DASH;
Throwable t = svcResult.getThrowable();
if (svcResult.isNok()) {
msg = svcResult.getMessage();
if (t != null) {
exceptionMsg = StringHelper.formatExceptionMessage(t);
if (StringHelper.isEmpty(msg))
msg = exceptionMsg;
}
}
JsonObject response = new JsonObject();
response.addProperty(MSG, msg);
if (!exceptionMsg.equals(StringHelper.DASH))
response.addProperty(EXCEPTION_MSG, exceptionMsg);
JsonObject response = svcResult.toJson();
String json = new Gson().toJson(response);
if (svcResult.isOk())