From 609e39c771a386186d87d399a9743bde437e1534 Mon Sep 17 00:00:00 2001
From: Marcin Kostrzewski <komar86311@gmail.com>
Date: Thu, 29 Oct 2020 11:36:15 +0100
Subject: [PATCH] changed converters to static

---
 src/main/java/Main/ProtocolMessage.java | 35 +++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Main/ProtocolMessage.java b/src/main/java/Main/ProtocolMessage.java
index 26f7e51..1c38169 100644
--- a/src/main/java/Main/ProtocolMessage.java
+++ b/src/main/java/Main/ProtocolMessage.java
@@ -1,13 +1,23 @@
 package Main;
 
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+
 public class ProtocolMessage {
+    private static final Logger logger = LogManager.getLogger(App.class);
+
     private int length;
     private char[] message;
 
     private char[] raw;
 
     /** Convert an integer into 4-byte array */
-    private byte[] intToByte(int value) {
+    public static byte[] intToByte(int value) {
         return new byte[] {
                 (byte)(value >>> 24),
                 (byte)(value >>> 16),
@@ -16,7 +26,7 @@ public class ProtocolMessage {
     }
 
     /** Convert a byte array into 4-byte integer */
-    private int byteToInt(byte[] bytes) {
+    public static int byteToInt(byte[] bytes) {
         return bytes[0] << 24 |
                 (bytes[1] & 0xFF) << 16 |
                 (bytes[2] & 0xFF) << 8 |
@@ -69,6 +79,27 @@ public class ProtocolMessage {
 
     }
 
+    public void sendToStream(Writer writer) throws IOException {
+        writer.write(this.raw);
+        writer.flush();
+    }
+
+    public void readFromStream(Reader reader) throws IOException {
+        int totalBytesRead = 0;
+
+        // Read first 4 bytes containing the length of the incoming message
+        while(totalBytesRead != 4){
+            int bytesRead = reader.read(this.raw, totalBytesRead, 4 - totalBytesRead);
+            if (bytesRead == -1) {
+                logger.log(Level.ERROR, "Invalid packet.");
+                return;
+            } else
+                totalBytesRead += bytesRead;
+        }
+
+
+    }
+
     public int getLength() {
         return length;
     }