Merged conflict fix

Squash comments

Author: RobertMili

src/main/java/org/fungover/haze/Main.java

@@ -11,9 +11,10 @@
 import java.net.Socket;
 import java.util.ArrayList;
 
+import java.util.Arrays;
 import java.util.List;
 
-import static org.fungover.haze.RespInputParser.readInputStream;
+
 
 public class Main {
     static boolean serverOpen = true;
@@ -83,8 +84,8 @@ private static void shutdown(HazeDatabase hazeDatabase) {
 
 
     public static void printThreadDebug() {
-        Log4j2.debug("ThreadID " + Thread.currentThread().threadId());  // Only for Debug
-        Log4j2.debug("Is virtual Thread " + Thread.currentThread().isVirtual()); // Only for Debug
+        logger.debug("ThreadID " + Thread.currentThread().threadId());  // Only for Debug
+        logger.debug("Is virtual Thread " + Thread.currentThread().isVirtual()); // Only for Debug
 
     }
 

src/main/java/org/fungover/haze/RespInputParser.java

@@ -1,15 +1,23 @@
 package org.fungover.haze;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
 public class RespInputParser {
-  public static void readInputStream(BufferedReader input, List<String> inputList, String firstReading) throws IOException {
+
+    RespInputParser() {
+    }
+    private static final Logger logger = LogManager.getLogger(RespInputParser.class);
+
+    public static void readInputStream(BufferedReader input, List<String> inputList, String firstReading) throws IOException {
         if (firstReading.startsWith("*")) {
 
-            Log4j2.debug("readInputStream: " + input + " " + inputList + " " + firstReading);
+            logger.debug("readInputStream: {} {} {}", input, inputList, firstReading);
             int size = Integer.parseInt(firstReading.substring(1)) * 2;
             for (int i = 0; i < size; i++) {
                 String temp = input.readLine();

src/test/java/org/fungover/haze/MainTest.java

@@ -107,13 +107,6 @@ void callExecuteCommandWithLMOVEShouldReturnErrorMessageWhenListIsEmpty() {
     void callExecuteCommandWithLTRIMShouldReturnErrorMessageWhenKeyDoesNotExist() {
         assertThat(Main.executeCommand(database, List.of("LTRIM", "key", "2", "3"), hazeList)).isEqualTo("-The key is not present in the database.\r\n");
     }
-    @Test
-    void callExecuteCommandWithDelAndMessageShouldReturnNull (){
-        inputList = new ArrayList<>();
-        inputList.add("DEL");
-        inputList.add("key1");
-        assertThat(Main.executeCommand(database,inputList)).isEqualTo(":0\r\n");
-    }
 
     @Test
     void testPrintThreadDebug() {