From a29e34f2c66305e9c1a0e43a71c948bb0646ec97 Mon Sep 17 00:00:00 2001 From: Carl Bingel Date: Sun, 16 Feb 2020 16:36:26 +0100 Subject: [PATCH] added generic data object --- .../signal/commands/JsonEvtLoopStatusReport.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/asamk/signal/commands/JsonEvtLoopStatusReport.java b/src/main/java/org/asamk/signal/commands/JsonEvtLoopStatusReport.java index cd1658e1..677108e4 100644 --- a/src/main/java/org/asamk/signal/commands/JsonEvtLoopStatusReport.java +++ b/src/main/java/org/asamk/signal/commands/JsonEvtLoopStatusReport.java @@ -21,6 +21,7 @@ public class JsonEvtLoopStatusReport { public String status; public String message; public JsonMessageEnvelope envelope; + public JsonNode data; /** @@ -35,6 +36,13 @@ public class JsonEvtLoopStatusReport { this.reqID = null; } + public JsonEvtLoopStatusReport( String respType, JsonNode reqID, JsonNode data) { + this.respType = respType; + this.status = "ok"; + this.reqID = reqID; + this.data = data; + } + /** * Creates new JsonEvtLoopStatusReport object to use for responding to requests * @@ -70,7 +78,11 @@ public class JsonEvtLoopStatusReport { ObjectMapper mpr = new ObjectMapper(); mpr.setVisibility( PropertyAccessor.FIELD, Visibility.ANY); try { - System.out.println( mpr.writeValueAsString(this)); + //System.out.println( mpr.writeValueAsString(this)); + JsonNode n = mpr.valueToTree(this); + System.out.println( mpr.writeValueAsString(n)); + } catch( IllegalArgumentException e) { + System.err.println( "JsonEvtLoopStatusReport: ERROR: Failed to serialize object: " + e.toString()); } catch( JsonProcessingException e) { System.err.println( "JsonEvtLoopStatusReport: ERROR: Failed to serialize object: " + e.toString()); }