Implement startLink and finishLink for jsonrpc daemon

[signal-cli] / src / main / java / org / asamk / signal / JsonWriterImpl.java

diff --git a/src/main/java/org/asamk/signal/JsonWriterImpl.java b/src/main/java/org/asamk/signal/JsonWriterImpl.java
index 772e4c7e87e1a5307568c9105e3888e7e91735ee..aabf399a37cc9476a6009ed65075521fd62a00d6 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonWriterImpl.java
+++ b/src/main/java/org/asamk/signal/JsonWriterImpl.java
@@ -1,29 +1,21 @@
 package org.asamk.signal;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import java.io.BufferedWriter;
+import org.asamk.signal.util.Util;
+
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.nio.charset.StandardCharsets;
 
 public class JsonWriterImpl implements JsonWriter {
 
     private final Writer writer;
     private final ObjectMapper objectMapper;
 
-    public JsonWriterImpl(final OutputStream outputStream) {
-        this.writer = new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8));
-
-        objectMapper = new ObjectMapper();
-        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY);
-        objectMapper.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+    public JsonWriterImpl(final Writer writer) {
+        this.writer = writer;
+        this.objectMapper = Util.createJsonObjectMapper();
     }
 
     public synchronized void write(final Object object) {