fixed issue #39

Continue connectionhandler

client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java

@@ -2,8 +2,6 @@ package ch.zhaw.pm2.multichat.client;
 
 import ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State;
 import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
-import ch.zhaw.pm2.multichat.protocol.ConnectionHandler;
-import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -36,17 +34,18 @@ public class ChatWindowController {
     @FXML private TextField filterValue;
 
 
-    @FXML
-    public void initialize() {
-        serverAddressField.setText(NetworkHandler.DEFAULT_ADDRESS.getCanonicalHostName());
-        serverPortField.setText(String.valueOf(NetworkHandler.DEFAULT_PORT));
-    }
-
     public void setMessages(ClientMessageList messages) {
         this.messages = messages;
         messageListener();
     }
 
+    public void setConnectionHandler(ClientConnectionHandler connectionHandler){
+        this.connectionHandler = connectionHandler;
+        startConnectionHandlerListener();
+        serverAddressField.setText(connectionHandler.getServerAddressProperty().get());
+        serverPortField.setText(String.valueOf(connectionHandler.getServerPortProperty().get()));
+    }
+
     private void applicationClose() {
         disconnect();
     }
@@ -100,35 +99,28 @@ public class ChatWindowController {
 
     @FXML
     private void applyFilter( ) {
-    	this.redrawMessageList();
+        Platform.runLater(() -> this.messageArea.setText(messages.getFilteredMessages(filterValue.getText().strip())));
     }
 
     private void startConnectionHandler() throws IOException {
         String userName = userNameField.getText();
+        if(!userName.contains(" ")) {
             String serverAddress = serverAddressField.getText();
             int serverPort = Integer.parseInt(serverPortField.getText());
-        connectionHandler = new ClientConnectionHandler(
+            connectionHandler.initialize(serverAddress, serverPort, userName);
-            NetworkHandler.openConnection(serverAddress, serverPort), userName,
-            messages);
             new Thread(connectionHandler).start();
 
             //register Listener
-        startListener();
+            //startConnectionHandlerListener();
 
             // register window close handler
             rootPane.getScene().getWindow().addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, windowCloseHandler);
-    }
+        } else {
-
+            addError("It is not allowed to have spaces in username!");
-    private void terminateConnectionHandler() {
-        // unregister window close handler
-        rootPane.getScene().getWindow().removeEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, windowCloseHandler);
-        if (connectionHandler != null) {
-            connectionHandler.stopReceiving();
-            connectionHandler = null;
         }
     }
 
-    public void stateChanged(ConnectionHandler.State newState) {
+    public void stateChanged(State newState) {
         // update UI (need to be run in UI thread: see Platform.runLater())
         Platform.runLater(new Runnable() {
             @Override
@@ -137,7 +129,7 @@ public class ChatWindowController {
             }
         });
         if(newState == DISCONNECTED){
-            terminateConnectionHandler();
+            connectionHandler.stopReceiving();
         }
     }
 
@@ -172,19 +164,13 @@ public class ChatWindowController {
         messages.addMessage(new Message(Message.MessageType.ERROR, null, null, message));
     }
 
-    private void redrawMessageList() {
-        this.messageArea.clear();
-        Platform.runLater(() -> this.messageArea.setText(messages.getFilteredMessages(filterValue.getText().strip())));
-    }
-
     class WindowCloseHandler implements EventHandler<WindowEvent> {
         public void handle(WindowEvent event) {
             applicationClose();
         }
-
     }
 
-    public void startListener() {
+    public void startConnectionHandlerListener() {
         connectionHandler.getStateProperty().addListener(new ChangeListener<State>() {
             @Override
             public void changed(ObservableValue<? extends State> observable, State oldValue, State newValue) {
@@ -218,7 +204,7 @@ public class ChatWindowController {
         messages.getChangedProperty().addListener(new ChangeListener<Boolean>() {
             @Override
             public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                redrawMessageList();
+                Platform.runLater(() -> messageArea.setText(messages.getFilteredMessages(filterValue.getText().strip())));
             }
         });
     }

client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java

@@ -17,7 +17,7 @@ import static ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State.*;
 
 public class ClientConnectionHandler extends ConnectionHandler implements Runnable {
 
-    private final Pattern messagePattern = Pattern.compile( "^(?:@(\\w*))?\\s*(.*)$" );
+    private final Pattern messagePattern = Pattern.compile( "^(?:@(\\S*))?\\s*(.*)$" );
 
     private SimpleStringProperty userName;
     private SimpleObjectProperty<State> state;
@@ -25,15 +25,21 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab
     private SimpleStringProperty serverAddress;
     private SimpleIntegerProperty serverPort;
 
-    public ClientConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
+    public ClientConnectionHandler(ClientMessageList messages)  {
-                                   String userName,
+        super();
-                                   ClientMessageList messages)  {
-        super(connection);
-        this.userName = new SimpleStringProperty((userName == null || userName.isBlank())? USER_NONE : userName);
         this.messages = messages;
         state = new SimpleObjectProperty<>(State.NEW);
-        serverAddress = new SimpleStringProperty();
+        serverAddress = new SimpleStringProperty(NetworkHandler.DEFAULT_ADDRESS.getCanonicalHostName());
-        serverPort = new SimpleIntegerProperty();
+        serverPort = new SimpleIntegerProperty(NetworkHandler.DEFAULT_PORT);
+        this.userName = new SimpleStringProperty(null);
+    }
+
+    public void initialize(String serverAddress, int serverPort, String userName) throws IOException {
+        state.set(NEW);
+        this.serverAddress.set(serverAddress);
+        this.serverPort.set(serverPort);
+        setConnection(NetworkHandler.openConnection(serverAddress, serverPort));
+        this.userName = new SimpleStringProperty((userName == null || userName.isBlank())? USER_NONE : userName);
     }
 
     public SimpleStringProperty getServerAddressProperty() { return serverAddress; }
@@ -48,7 +54,6 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab
 
     public void setState (State newState) {
         state.set(newState);
-
     }
 
     public void run () {
@@ -94,34 +99,34 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab
 
     private void processData(String data) {
         try {
-            // parse data content
             Scanner scanner = new Scanner(data);
-            String sender = null;
+            StringBuilder sender = new StringBuilder();
-            String reciever = null;
+            StringBuilder reciever = new StringBuilder();
-            String type = null;
+            StringBuilder type = new StringBuilder();
-            String payload = null;
+            StringBuilder payload = new StringBuilder();
-            if (scanner.hasNextLine()) {
+            super.processData(scanner,sender,reciever,type,payload);
-                sender = scanner.nextLine();
+
-            } else {
-                throw new ChatProtocolException("No Sender found");
-            }
-            if (scanner.hasNextLine()) {
-                reciever = scanner.nextLine();
-            } else {
-                throw new ChatProtocolException("No Reciever found");
-            }
-            if (scanner.hasNextLine()) {
-                type = scanner.nextLine();
-            } else {
-                throw new ChatProtocolException("No Type found");
-            }
-            if (scanner.hasNextLine()) {
-                payload = scanner.nextLine();
-            }
             // dispatch operation based on type parameter
-            if (type.equals(getDataTypeConnect())) {
+            if (type.toString().equals(getDataTypeConnect())) {
                 System.err.println("Illegal connect request from server");
-            } else if (type.equals(getDataTypeConfirm())) {
+            } else if (type.toString().equals(getDataTypeConfirm())) {
+                caseConfirm(sender.toString(), reciever.toString(), payload.toString());
+            } else if (type.toString().equals(getDataTypeDisconnect())) {
+                caseDisconnect(sender.toString(),reciever.toString(),payload.toString());
+            } else if (type.toString().equals(getDataTypeMessage())) {
+                caseMessage(sender.toString(),reciever.toString(),payload.toString());
+            } else if (type.toString().equals(getDataTypeError())) {
+                caseError(sender.toString(), reciever.toString(), payload.toString());
+            } else {
+                System.out.println("Unknown data type received: " + type);
+            }
+        } catch (ChatProtocolException e) {
+            System.err.println("Error while processing data: " + e.getMessage());
+            sendData(USER_NONE, userName.get(), getDataTypeError(), e.getMessage());
+        }
+    }
+
+    private void caseConfirm(String sender, String reciever, String payload) {
         if (state.get() == CONFIRM_CONNECT) {
             this.userName.set(reciever);
             this.serverPort.set(getConnection().getRemotePort());
@@ -136,7 +141,9 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab
         } else {
             System.err.println("Got unexpected confirm message: " + payload);
         }
-            } else if (type.equals(getDataTypeDisconnect())) {
+    }
+
+    private void caseDisconnect(String sender, String reciever, String payload) {
         if (state.get() == DISCONNECTED) {
             System.out.println("DISCONNECT: Already in disconnected: " + payload);
             return;
@@ -144,44 +151,20 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab
         messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
         System.out.println("DISCONNECT: " + payload);
         this.setState(DISCONNECTED);
-            } else if (type.equals(getDataTypeMessage())) {
+    }
+
+    private void caseMessage(String sender, String reciever, String payload) {
         if (state.get() != CONNECTED) {
             System.out.println("MESSAGE: Illegal state " + state + " for message: " + payload);
             return;
         }
         messages.addMessage(new Message(Message.MessageType.MESSAGE,sender,reciever,payload));
         System.out.println("MESSAGE: From " + sender + " to " + reciever + ": "+  payload);
-            } else if (type.equals(getDataTypeError())) {
-                messages.addMessage(new Message(Message.MessageType.ERROR,sender,reciever,payload));
-                System.out.println("ERROR: " + payload);
-            } else {
-                System.out.println("Unknown data type received: " + type);
-            }
-        } catch (ChatProtocolException e) {
-            System.err.println("Error while processing data: " + e.getMessage());
-            sendData(USER_NONE, userName.get(), getDataTypeError(), e.getMessage());
-        }
     }
 
-    private void sendData(String sender, String receiver, String type, String payload) {
+    private void caseError(String sender, String reciever, String payload) {
-        if (getConnection().isAvailable()) {
+        messages.addMessage(new Message(Message.MessageType.ERROR,sender,reciever,payload));
-            new StringBuilder();
+        System.out.println("ERROR: " + payload);
-            String data = new StringBuilder()
-                .append(sender+"\n")
-                .append(receiver+"\n")
-                .append(type+"\n")
-                .append(payload+"\n")
-                .toString();
-            try {
-                getConnection().send(data);
-            } catch (SocketException e) {
-                System.err.println("Connection closed: " + e.getMessage());
-            } catch (EOFException e) {
-                System.out.println("Connection terminated by remote");
-            } catch(IOException e) {
-                System.err.println("Communication error: " + e.getMessage());
-            }
-        }
     }
 
     public void connect() throws ChatProtocolException {
@@ -213,5 +196,4 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab
             return false;
         }
     }
-
 }

client/src/main/java/ch/zhaw/pm2/multichat/client/ClientUI.java

@@ -8,6 +8,7 @@ import javafx.stage.Stage;
 
 public class ClientUI extends Application {
     private ClientMessageList clientMessageList = new ClientMessageList();
+    private ClientConnectionHandler connectionHandler = new ClientConnectionHandler(clientMessageList);
 
     @Override
     public void start(Stage primaryStage) {
@@ -21,6 +22,7 @@ public class ClientUI extends Application {
 
             ChatWindowController chatWindowController = loader.getController();
             chatWindowController.setMessages(clientMessageList);
+            chatWindowController.setConnectionHandler(connectionHandler);
 
             // fill in scene and stage setup
             Scene scene = new Scene(rootPane);

protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/ConnectionHandler.java

@@ -1,5 +1,10 @@
 package ch.zhaw.pm2.multichat.protocol;
 
+import java.io.EOFException;
+import java.io.IOException;
+import java.net.SocketException;
+import java.util.Scanner;
+
 public abstract class ConnectionHandler {
     private NetworkHandler.NetworkConnection<String> connection;
 
@@ -14,11 +19,7 @@ public abstract class ConnectionHandler {
     public static final String USER_ALL = "*";
 
     public enum State {
-        NEW, CONFIRM_CONNECT, CONNECTED, CONFIRM_DISCONNECT, DISCONNECTED;
+        NEW, CONFIRM_CONNECT, CONNECTED, CONFIRM_DISCONNECT, DISCONNECTED, ERROR;
-    }
-
-    public ConnectionHandler(NetworkHandler.NetworkConnection<String> connection) {
-        this.connection = connection;
     }
 
     public static String getDataTypeConnect() {
@@ -45,7 +46,50 @@ public abstract class ConnectionHandler {
         return connection;
     }
 
-    protected void setConnection() {
+    protected void setConnection(NetworkHandler.NetworkConnection<String> connection) {
         this.connection = connection;
     }
+
+    protected void processData(Scanner scanner, StringBuilder sender, StringBuilder reciever, StringBuilder type, StringBuilder payload) throws ChatProtocolException {
+        // parse data content
+        if (scanner.hasNextLine()) {
+            sender.append(scanner.nextLine());
+        } else {
+            throw new ChatProtocolException("No Sender found");
+        }
+        if (scanner.hasNextLine()) {
+            reciever.append(scanner.nextLine());
+        } else {
+            throw new ChatProtocolException("No Reciever found");
+        }
+        if (scanner.hasNextLine()) {
+            type.append(scanner.nextLine());
+        } else {
+            throw new ChatProtocolException("No Type found");
+        }
+        if (scanner.hasNextLine()) {
+            payload.append(scanner.nextLine());
+        }
+    }
+
+    protected void sendData(String sender, String receiver, String type, String payload) {
+        if (connection.isAvailable()) {
+            new StringBuilder();
+            String data = new StringBuilder()
+                    .append(sender+"\n")
+                    .append(receiver+"\n")
+                    .append(type+"\n")
+                    .append(payload+"\n")
+                    .toString();
+            try {
+                getConnection().send(data);
+            } catch (SocketException e) {
+                System.err.println("Connection closed: " + e.getMessage());
+            } catch (EOFException e) {
+                System.out.println("Connection terminated by remote");
+            } catch(IOException e) {
+                System.err.println("Communication error: " + e.getMessage());
+            }
+        }
+    }
 }

server/src/main/java/ch/zhaw/pm2/multichat/server/Server.java

@@ -1,5 +1,6 @@
 package ch.zhaw.pm2.multichat.server;
 
+import ch.zhaw.pm2.multichat.protocol.ConnectionHandler;
 import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 
 import java.io.IOException;
@@ -9,7 +10,15 @@ import java.util.Map;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-
+/**
+ * This Class represents a Server. The user can start the programm with the port number as a argument.
+ * If no argument has been set the {@link NetworkHandler#DEFAULT_PORT} is used as port number.
+ * After initialising the server:
+ * 1. Starts a Socketserver using the logic given in {@link NetworkHandler.NetworkServer#createServer()}
+ * 2. The server starts to listen for incoming connection using the Logic given in {@link NetworkHandler.NetworkServer#waitForConnection()}
+ * 3. New conections will be atached to a Connectionhandler: {@link ServerConnectionHandler} and placed in a Map containing all active connections {@link Server#connections}
+ *
+ */
 public class Server {
 
     // Server connection
@@ -56,6 +65,11 @@ public class Server {
         }
     }
 
+    /**
+     * The Constructor to create a new instance.
+     * @param serverPort to listen for incoming connections.
+     * @throws IOException thrown if an I/O error occurs when opening the socket.
+     */
     public Server(int serverPort) throws IOException {
         // Open server connection
         System.out.println("Create server connection");
@@ -63,6 +77,10 @@ public class Server {
         System.out.println("Listening on " + networkServer.getHostAddress() + ":" + networkServer.getHostPort());
     }
 
+    /**
+     * With this methode the instance waits for incoming connections. If a client tries to connect to the server.
+     * The connection will be registered in the connection registry if successful.
+     */
     private void start() {
         ReentrantLock mutex = new ReentrantLock();
         Condition nameComplete = mutex.newCondition();
@@ -72,31 +90,19 @@ public class Server {
                  NetworkHandler.NetworkConnection<String> connection = networkServer.waitForConnection();
                  ServerConnectionHandler connectionHandler = new ServerConnectionHandler(connection, connections, mutex, nameComplete);
                  new Thread(connectionHandler).start();
-                 mutex.lock();
-                 try {
-                     nameComplete.await();
-                     System.out.println(String.format("Connected new Client %s with IP:Port <%s:%d>",
-                             connectionHandler.getUserName(),
-                             connection.getRemoteHost(),
-                             connection.getRemotePort()
-                     ));
-                 }
-                finally {
-                     mutex.unlock();
-                 }
             }
         } catch(SocketException e) {
             System.out.println("Server connection terminated");
-        }
+        } catch (IOException e) {
-        catch (IOException e) {
             System.err.println("Communication error " + e);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
         }
         // close server
         System.out.println("Server Stopped.");
     }
 
+    /**
+     * This method will stop the serversocket.
+     */
     public void terminate() {
         try {
             System.out.println("Close server port.");

server/src/main/java/ch/zhaw/pm2/multichat/server/ServerConnectionHandler.java

@@ -2,12 +2,12 @@ package ch.zhaw.pm2.multichat.server;
 
 import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
 import ch.zhaw.pm2.multichat.protocol.ConnectionHandler;
+import static ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State.*;
 import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 
 import java.io.EOFException;
 import java.io.IOException;
 import java.net.SocketException;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Scanner;
@@ -15,8 +15,32 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static ch.zhaw.pm2.multichat.server.ServerConnectionHandler.State.*;
 
+/**
+ * This class represents the connection between the server and a client and offers the serverside logic.
+ * The ServerConnectionHandler receives data send from the client aswell as sends data to the client.
+ *
+ * The ServeConnectionHandler offers following functionality:
+ *
+ * Evaluating connection attempts from a client by:
+ * 1. Checks if Username is valid (Not used)
+ * 2. Saves Username in {@link ServerConnectionHandler#userName}
+ * 3. Saves the connection in the {@link ServerConnectionHandler#connectionRegistry}
+ *
+ * Processes disconnections from a client by:
+ * 1. Removing the connection from the {@link ServerConnectionHandler#connectionRegistry}
+ * 2. Terminates the socket by calling {@link NetworkHandler.NetworkConnection#close()}
+ *
+ * Processes Messages send from a client by:
+ * 1. Evaluating the reciever by differentiating between broadcast or unicast.
+ * 2. Sending the message accordingly.
+ *
+ * To use this class, start a new instance and start it in a thread.
+ * To constructor needs following parameter:
+ * 1. {@link ch.zhaw.pm2.multichat.protocol.NetworkHandler.NetworkConnection} representing the socket connection between server and client
+ * 2. {@link Map<String,ServerConnectionHandler>} registry to check for all active connections
+ * 3. {@link ReentrantLock @link Condition} to lock server thread to evaluate connection.
+ * */
 public class ServerConnectionHandler extends ConnectionHandler implements Runnable{
     private static final AtomicInteger connectionCounter = new AtomicInteger(0);
     private final int connectionId = connectionCounter.incrementAndGet();
@@ -29,18 +53,25 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
     private String userName = "Anonymous-"+connectionId;
     private State state = NEW;
 
+    /**
+     * Called when runnable gets started in a thread.
+     */
     @Override
     public void run() {
         startReceiving();
     }
 
-    enum State {
+    /**
-        NEW, CONNECTED, DISCONNECTED;
+     * Constructor to intitialize the connection
-    }
+     * @param connection representing the socket connection between server and clinet
-
+     * @param registry map containing all active connections between server and clients
+     * @param mutex to lock thread
+     * @param nameComplete condition to call threads
+     */
     public ServerConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
                                    Map<String,ServerConnectionHandler> registry, ReentrantLock mutex, Condition nameComplete) {
-        super(connection);
+        super();
+        setConnection(connection);
         Objects.requireNonNull(connection, "Connection must not be null");
         Objects.requireNonNull(registry, "Registry must not be null");
         this.connectionRegistry = registry;
@@ -48,15 +79,31 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
         this.nameComplete = nameComplete;
     }
 
+    /**
+     *
+     * @return the username of the connected client
+     */
     public String getUserName() {
         return this.userName;
     }
 
+    /**
+     *
+     * @return state of the connection. Poosible states are see {@link ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State}
+     */
+    public State getState() {
+        return state;
+    }
+
+    /**
+     * This methods runs in a whileloop as long as the socket between server and client is available
+     * and the connection State is not ERROR.
+     */
     private void startReceiving() {
             System.out.println("Starting Connection Handler for new User");
             try {
                 System.out.println("Start receiving data...");
-                while (getConnection().isAvailable()) {
+                while (getConnection().isAvailable() && !(state == ERROR)) {
                     String data = getConnection().receive();
                     processData(data);
                 }
@@ -74,10 +121,17 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
             } catch (ClassNotFoundException e) {
                 System.err.println("Received object of unknown type: " + e.getMessage());
             }
+        if (state == ERROR) {
+            System.out.println("Stopping Connection Handler for Rejected Client");
+        } else {
             System.out.println("Stopping Connection Handler for " + userName);
+        }
 
     }
 
+    /**
+     * This method will call {@link NetworkHandler.NetworkConnection#close()} to close the Socket.
+     */
     private void stopReceiving() {
         System.out.println("Closing Connection Handler for " + userName);
         try {
@@ -85,58 +139,86 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
             getConnection().close();
             System.out.println("Stopped receiving data.");
         } catch (IOException e) {
-            System.err.println("Failed to close connection." + e);
+            System.err.println("Failed to close connection." + e.getMessage());
         }
         System.out.println("Closed Connection Handler for " + userName);
     }
 
+    /**
+     * This method gets called when socket recieves data. The method checks for the data type and reacts accordingly
+     * If data type:
+     * 1. Connect => checks if username is valid. if valid sends response to client with confirmation.
+     *  If username not valid quits connection by changing status to ERROR.
+     * 2. Confirm => Server should not recieve this kind of message. STDOUT informs about it.
+     * 3. Disconnect => Disconnects connection by removing connection from registry and calling method to terminate socket.
+     * 4. Message => Checks if broadcast or unicast. Sends data accordingly
+     * 5. Error => STDERR message
+     * @param data recieved by the server
+     */
     private void processData(String data)  {
         try {
-            // parse data content
             Scanner scanner = new Scanner(data);
-            String sender = null;
+            StringBuilder sender = new StringBuilder();
-            String reciever = null;
+            StringBuilder reciever = new StringBuilder();
-            String type = null;
+            StringBuilder type = new StringBuilder();
-            String payload = null;
+            StringBuilder payload = new StringBuilder();
-            if (scanner.hasNextLine()) {
+            super.processData(scanner,sender,reciever,type,payload);
-                sender = scanner.nextLine();
-            } else {
-                throw new ChatProtocolException("No Sender found");
-            }
-            if (scanner.hasNextLine()) {
-                reciever = scanner.nextLine();
-            } else {
-                throw new ChatProtocolException("No Reciever found");
-            }
-            if (scanner.hasNextLine()) {
-                type = scanner.nextLine();
-            } else {
-                throw new ChatProtocolException("No Type found");
-            }
-            if (scanner.hasNextLine()) {
-                payload = scanner.nextLine();
-            }
 
             // dispatch operation based on type parameter
-            if (type.equals(getDataTypeConnect())) {
+            if (type.toString().equals(getDataTypeConnect())) {
+                caseConnect(sender.toString());
+            } else if (type.toString().equals(getDataTypeConfirm())) {
+                System.out.println("Not expecting to receive a CONFIRM request from client");
+            } else if (type.toString().equals(getDataTypeDisconnect())) {
+                caseDisconnect();
+            } else if (type.toString().equals(getDataTypeMessage())) {
+                caseMessage(sender.toString(), reciever.toString(), type.toString(), payload.toString());
+            } else if (type.toString().equals(getDataTypeError())) {
+                System.err.println("Received error from client (" + sender + "): " + payload);
+            } else {
+                System.err.println("Unknown data type received: " + type);
+
+            }
+        } catch(ChatProtocolException e) {
+            System.out.println("Error while processing data " + e.getMessage());
+            sendData(USER_NONE, userName, getDataTypeError(), e.getMessage());
+        }
+    }
+
+    /**
+     * This method is called by method {@link ServerConnectionHandler#processData(String)}
+     * Checks if username is valid. if valid sends response to client with confirmation.
+     * @param sender of the payload
+     * @throws ChatProtocolException if username not valid
+     */
+    private void caseConnect(String sender) throws ChatProtocolException {
         if (this.state != NEW) throw new ChatProtocolException("Illegal state for connect request: " + state);
-                if (sender == null || sender.isBlank()) sender = this.userName;
+        if (sender.isBlank()) sender = this.userName;
-                if (connectionRegistry.containsKey(sender))
+        //if username not valid
+        if (connectionRegistry.containsKey(sender)) {
+            state = ERROR;
+            System.out.println(String.format("Connecting failed for new Client with IP:Port <%s:%d>.\nReason: Name already taken.",
+                    getConnection().getRemoteHost(),
+                    getConnection().getRemotePort()));
             throw new ChatProtocolException("User name already taken: " + sender);
-                mutex.lock();
+        }
-                try {
+        //if username valid
         this.userName = sender;
-                    nameComplete.signal();
-                }
-                finally {
-                    mutex.unlock();
-                }
         connectionRegistry.put(userName, this);
         sendData(USER_NONE, userName, getDataTypeConfirm(), "Registration successfull for " + userName);
         this.state = CONNECTED;
-            } else if (type.equals(getDataTypeConfirm())) {
+        System.out.println(String.format("Connected new Client %s with IP:Port <%s:%d>",
-                System.out.println("Not expecting to receive a CONFIRM request from client");
+                userName,
-            } else if (type.equals(getDataTypeDisconnect())) {
+                getConnection().getRemoteHost(),
+                getConnection().getRemotePort()));
+    }
+
+    /**
+     * This method is called by method {@link ServerConnectionHandler#processData(String)}
+     * Disconnects connection by removing connection from registry and calling method {@link ServerConnectionHandler#stopReceiving()} to terminate socket.
+     * @throws ChatProtocolException if state allready DISCONNECTED.
+     */
+    private void caseDisconnect() throws ChatProtocolException {
         if (state == DISCONNECTED)
             throw new ChatProtocolException("Illegal state for disconnect request: " + state);
         if (state == CONNECTED) {
@@ -145,7 +227,18 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
         sendData(USER_NONE, userName, getDataTypeConfirm(), "Confirm disconnect of " + userName);
         this.state = DISCONNECTED;
         this.stopReceiving();
-            } else if (type.equals(getDataTypeMessage())) {
+    }
+
+    /**
+     * This method is called by method {@link ServerConnectionHandler#processData(String)}
+     * Checks if broadcast or unicast. Sends data accordingly
+     * @param sender who sent data
+     * @param reciever to recieve data
+     * @param type of message
+     * @param payload data to transmit
+     * @throws ChatProtocolException if state not equal to CONNECT
+     */
+    private void caseMessage(String sender, String reciever, String type, String payload) throws ChatProtocolException{
         if (state != CONNECTED) throw new ChatProtocolException("Illegal state for message request: " + state);
         if (USER_ALL.equals(reciever)) {
             for (ServerConnectionHandler handler : connectionRegistry.values()) {
@@ -162,36 +255,5 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
                 this.sendData(USER_NONE, userName, getDataTypeError(), "Unknown User: " + reciever);
             }
         }
-            } else if (type.equals(getDataTypeError())) {
-                System.err.println("Received error from client (" + sender + "): " + payload);
-            } else {
-                System.err.println("Unknown data type received: " + type);
-
-            }
-        } catch(ChatProtocolException e) {
-            System.out.println("Error while processing data" + e.getMessage());
-            sendData(USER_NONE, userName, getDataTypeError(), e.getMessage());
-        }
-    }
-
-    private void sendData(String sender, String receiver, String type, String payload) {
-        if (getConnection().isAvailable()) {
-            new StringBuilder();
-            String data = new StringBuilder()
-                .append(sender+"\n")
-                .append(receiver+"\n")
-                .append(type+"\n")
-                .append(payload+"\n")
-                .toString();
-            try {
-                getConnection().send(data);
-            } catch (SocketException e) {
-                System.out.println("Connection closed: " + e.getMessage());
-            } catch (EOFException e) {
-                System.out.println("Connection terminated by remote");
-            } catch(IOException e) {
-                System.out.println("Communication error: " + e.getMessage());
-            }
-        }
     }
 }