Add JsonRpcMultiCommand

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

diff --git a/src/main/java/org/asamk/signal/PlainTextWriterImpl.java b/src/main/java/org/asamk/signal/PlainTextWriterImpl.java
index d6536481551d0506a731b3add0c6f749d84cf7af..f43fe73ea220a48303e5e97bf18ceda6b72bd077 100644 (file)
--- a/src/main/java/org/asamk/signal/PlainTextWriterImpl.java
+++ b/src/main/java/org/asamk/signal/PlainTextWriterImpl.java
@@ -2,10 +2,7 @@ package org.asamk.signal;
 
 import org.slf4j.helpers.MessageFormatter;
 
-import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.io.Writer;
 
 public final class PlainTextWriterImpl implements PlainTextWriter {
@@ -14,17 +11,21 @@ public final class PlainTextWriterImpl implements PlainTextWriter {
 
     private PlainTextWriter indentedWriter;
 
-    public PlainTextWriterImpl(final OutputStream outputStream) {
-        this.writer = new BufferedWriter(new OutputStreamWriter(outputStream));
+    public PlainTextWriterImpl(final Writer writer) {
+        this.writer = writer;
     }
 
     @Override
-    public void println(String format, Object... args) throws IOException {
+    public void println(String format, Object... args) {
         final var message = MessageFormatter.arrayFormat(format, args).getMessage();
 
-        writer.write(message);
-        writer.write(System.lineSeparator());
-        writer.flush();
+        try {
+            writer.write(message);
+            writer.write(System.lineSeparator());
+            writer.flush();
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
     }
 
     @Override
@@ -51,8 +52,12 @@ public final class PlainTextWriterImpl implements PlainTextWriter {
         }
 
         @Override
-        public void println(final String format, final Object... args) throws IOException {
-            writer.write(spaces);
+        public void println(final String format, final Object... args) {
+            try {
+                writer.write(spaces);
+            } catch (IOException e) {
+                throw new AssertionError(e);
+            }
             plainTextWriter.println(format, args);
         }