allow redirecting (error) log streams

Author: thsc42

src/main/java/net/sharksystem/asap/ASAPChunk.java

@@ -1,6 +1,5 @@
 package net.sharksystem.asap;
 
-import com.sun.xml.internal.ws.wsdl.writer.document.Message;
 import net.sharksystem.asap.engine.MessagesContainer;
 
 import java.io.IOException;

src/main/java/net/sharksystem/asap/ASAPEncounterManagerImpl.java

@@ -1,12 +1,10 @@
 package net.sharksystem.asap;
 
-import com.sun.istack.NotNull;
 import net.sharksystem.asap.protocol.ASAPConnection;
 import net.sharksystem.asap.protocol.ASAPConnectionListener;
 import net.sharksystem.asap.utils.PeerIDHelper;
 import net.sharksystem.utils.streams.StreamPair;
 import net.sharksystem.utils.Log;
-import net.sharksystem.utils.tcp.StreamPairCreatedListener;
 
 import java.io.*;
 import java.util.*;
@@ -41,11 +39,11 @@ public class ASAPEncounterManagerImpl implements ASAPEncounterManager, ASAPConne
     /** remember remote address of peers (they can have more than one): peerID -> remote address */
     private Map<CharSequence, Set<CharSequence>> peerRemoteAddresses = new HashMap<>();
 
-    public ASAPEncounterManagerImpl(@NotNull ASAPConnectionHandler asapConnectionHandler) {
+    public ASAPEncounterManagerImpl(ASAPConnectionHandler asapConnectionHandler) {
         this(asapConnectionHandler, DEFAULT_WAIT_BEFORE_RECONNECT_TIME);
     }
 
-    public ASAPEncounterManagerImpl(@NotNull ASAPConnectionHandler asapConnectionHandler, long waitingPeriod) {
+    public ASAPEncounterManagerImpl(ASAPConnectionHandler asapConnectionHandler, long waitingPeriod) {
         this.asapConnectionHandler = asapConnectionHandler;
         this.randomValue = new Random(System.currentTimeMillis()).nextInt();
         this.waitBeforeReconnect = waitingPeriod;

src/main/java/net/sharksystem/utils/Log.java

@@ -1,6 +1,19 @@
 package net.sharksystem.utils;
 
+import java.io.PrintStream;
+
 public class Log {
+    private static PrintStream outStream = System.out;
+    private static PrintStream errStream = System.err;
+
+    public static void setOutStream(PrintStream outStream) {
+        Log.outStream = outStream;
+    }
+
+    public static void setErrStream(PrintStream errStream) {
+        Log.errStream = errStream;
+    }
+
     public static StringBuilder startLog(Object o, String parameter) {
         return startLog(o.getClass(), parameter);
     }
@@ -26,31 +39,31 @@ public static StringBuilder startLog(Class c, String parameter) {
     }
 
     public static void writeLog(Object o, String parameter, String message) {
-        System.out.println(Log.startLog(o, parameter) + message);
+        Log.outStream.println(Log.startLog(o, parameter) + message);
     }
 
     public static void writeLog(Object o, String message) {
         writeLog(o, null, message);
     }
 
     public static void writeLog(Class c, String parameter, String message) {
-        System.out.println(Log.startLog(c, parameter) + message);
+        Log.outStream.println(Log.startLog(c, parameter) + message);
     }
 
     public static void writeLog(Class c, String message) {
         writeLog(c, null, message);
     }
 
     public static void writeLogErr(Object o, String parameter, String message) {
-        System.err.println(Log.startLog(o, parameter) + message);
+        Log.errStream.println(Log.startLog(o, parameter) + message);
     }
 
     public static void writeLogErr(Object o, String message) {
         writeLogErr(o, null, message);
     }
 
     public static void writeLogErr(Class c, String parameter, String message) {
-        System.err.println(Log.startLog(c, parameter) + message);
+        Log.errStream.println(Log.startLog(c, parameter) + message);
     }
 
     public static void writeLogErr(Class c, String message) {