Start refactoring ClientConnectionHandler.java

ERROR UnsupportedOperationException in ClientMessageList

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

@@ -6,6 +6,7 @@ import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.collections.ListChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -41,20 +42,23 @@ public class ChatWindowController {
     public void initialize() {
         serverAddressField.setText(NetworkHandler.DEFAULT_ADDRESS.getCanonicalHostName());
         serverPortField.setText(String.valueOf(NetworkHandler.DEFAULT_PORT));
-    }
+        this.messages = new ClientMessageList();
 
-    public void setMessages(ClientMessageList messages) {
+        messages.getChangedProperty().addListener(new ChangeListener<Boolean>() {
-        this.messages = messages;
+            @Override
-        messageListener();
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                setMessageField(messages.getMessages());
+            }
+        });
     }
 
     private void applicationClose() {
-        disconnect();
+        connectionHandler.setState(DISCONNECTED);
     }
 
     @FXML
     private void toggleConnection () {
-        if (connectionHandler == null || connectionHandler.getStateProperty().get() != CONNECTED) {
+        if (connectionHandler == null || connectionHandler.getStateObjectProperty().get() != CONNECTED) {
             connect();
         } else {
             disconnect();
@@ -67,19 +71,19 @@ public class ChatWindowController {
             startConnectionHandler();
             connectionHandler.connect();
         } catch(ChatProtocolException | IOException e) {
-            addError(e.getMessage());
+            messages.addMessage(null,null, e.getMessage(), Message.MessageType.ERROR);
         }
     }
 
     private void disconnect() {
         if (connectionHandler == null) {
-            addError("No connection handler");
+            messages.addMessage(null,null,"No connection handler", Message.MessageType.ERROR);
             return;
         }
         try {
             connectionHandler.disconnect();
         } catch (ChatProtocolException e) {
-            addError(e.getMessage());
+            messages.addMessage(null,null, e.getMessage(), Message.MessageType.ERROR);
         }
     }
 
@@ -88,33 +92,32 @@ public class ChatWindowController {
         String messageString = messageField.getText().strip();
         try {
             if (connectionHandler == null) {
-                addError("No connection handler");
+                messages.addMessage(null,null,"No connection handler", Message.MessageType.ERROR);
             } else if (!connectionHandler.message(messageString)) {
-                addError("Not a valid message format.");
+                messages.addMessage(null,null,"Not a valid message format.", Message.MessageType.ERROR);
             } else {
                 messageField.clear();
             }
         } catch (ChatProtocolException e) {
-            addError(e.getMessage());
+            messages.addMessage(null,null, e.getMessage(), Message.MessageType.ERROR);
         }
     }
 
+    //TODO: TEST
     @FXML
     private void applyFilter( ) {
-    	this.redrawMessageList();
+        messages.getFilteredMessages(filterValue.getText().strip());
     }
 
     private void startConnectionHandler() throws IOException {
         String userName = userNameField.getText();
         String serverAddress = serverAddressField.getText();
         int serverPort = Integer.parseInt(serverPortField.getText());
-        connectionHandler = new ClientConnectionHandler(
+        connectionHandler = new ClientConnectionHandler(messages,serverAddress,serverPort,userName);
-            NetworkHandler.openConnection(serverAddress, serverPort), userName,
-            messages);
         new Thread(connectionHandler).start();
 
-        //register Listener
+        //register changelistener
-        startListener();
+        startChangeListener();
 
         // register window close handler
         rootPane.getScene().getWindow().addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, windowCloseHandler);
@@ -142,6 +145,49 @@ public class ChatWindowController {
         }
     }
 
+    private void startChangeListener() {
+        //Listener for State
+        connectionHandler.getStateObjectProperty().addListener(new ChangeListener<State>() {
+            @Override
+            public void changed(ObservableValue<? extends State> observable, State oldValue, State newValue) {
+                stateChanged(newValue);
+            }
+        });
+
+        //Listener for Username
+        connectionHandler.getUserNameProperty().addListener(new ChangeListener<String>() {
+            @Override
+            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                setUserName(newValue);
+            }
+        });
+
+        //Listener for Address
+        connectionHandler.getServerAddressProperty().addListener(new ChangeListener<String>() {
+            @Override
+            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                setServerAddress(newValue);
+            }
+        });
+
+        //Listener for Port
+        connectionHandler.getServerPortProperty().addListener(new ChangeListener<Number>() {
+            @Override
+            public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
+                setServerPort(newValue.intValue());
+            }
+        });
+    }
+
+    public void setMessageField(String message) {
+        Platform.runLater(new Runnable() {
+            @Override
+            public void run() {
+                messageField.setText(message);
+            }
+        });
+    }
+
     public void setUserName(String userName) {
         Platform.runLater(new Runnable() {
             @Override
@@ -169,10 +215,7 @@ public class ChatWindowController {
         });
     }
 
-    public void addError(String message) {
+    //TODO: MAKE ChangeListener
-        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())));
@@ -185,43 +228,4 @@ public class ChatWindowController {
 
     }
 
-    public void startListener() {
-        connectionHandler.getStateProperty().addListener(new ChangeListener<State>() {
-            @Override
-            public void changed(ObservableValue<? extends State> observable, State oldValue, State newValue) {
-                stateChanged(newValue);
-            }
-        });
-
-        connectionHandler.getUserNameProperty().addListener(new ChangeListener<String>() {
-            @Override
-            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                setUserName(newValue);
-            }
-        });
-
-        connectionHandler.getServerAddressProperty().addListener(new ChangeListener<String>() {
-            @Override
-            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                setServerAddress(newValue);
-            }
-        });
-
-        connectionHandler.getServerPortProperty().addListener(new ChangeListener<Number>() {
-            @Override
-            public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
-                setServerPort(newValue.intValue());
-            }
-        });
-    }
-
-    private void messageListener() {
-        messages.getChangedProperty().addListener(new ChangeListener<Boolean>() {
-            @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                redrawMessageList();
-            }
-        });
-    }
-
 }

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

@@ -2,6 +2,7 @@ package ch.zhaw.pm2.multichat.client;
 
 import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
 import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -14,9 +15,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static ch.zhaw.pm2.multichat.client.ClientConnectionHandler.State.*;
+import static ch.zhaw.pm2.multichat.client.Message.MessageType.*;
 
 public class ClientConnectionHandler implements Runnable {
-    private final NetworkHandler.NetworkConnection<String> connection;
+    private NetworkHandler.NetworkConnection<String> connection;
 
     // Data types used for the Chat Protocol
     private static final String DATA_TYPE_CONNECT = "CONNECT";
@@ -28,42 +30,44 @@ public class ClientConnectionHandler implements Runnable {
     public static final String USER_NONE = "";
     public static final String USER_ALL = "*";
 
-    private final Pattern messagePattern = Pattern.compile( "^(?:@(\\w*))?\\s*(.*)$" );
-
     private SimpleStringProperty userName;
-    private SimpleObjectProperty<State> state;
-    private ClientMessageList messages;
-    private SimpleStringProperty serverAddress;
     private SimpleIntegerProperty serverPort;
+    private SimpleStringProperty serverAddress;
+    private ObjectProperty<State> stateObjectProperty;
+    private ClientMessageList messageList;
+    private final Pattern messagePattern = Pattern.compile( "^(?:@(\\w*))?\\s*(.*)$" );
 
     enum State {
         NEW, CONFIRM_CONNECT, CONNECTED, CONFIRM_DISCONNECT, DISCONNECTED;
     }
 
-    public ClientConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
+    public ClientConnectionHandler(ClientMessageList messageList,String serverAddress,int serverPort,String userName) throws IOException {
-                                   String userName,
+        this.stateObjectProperty = new SimpleObjectProperty<>(NEW);
-                                   ClientMessageList messages)  {
-        this.connection = connection;
         this.userName = new SimpleStringProperty((userName == null || userName.isBlank())? USER_NONE : userName);
-        this.messages = messages;
+        this.serverPort = new SimpleIntegerProperty();
-        state = new SimpleObjectProperty<>(NEW);
+        this.serverAddress = new SimpleStringProperty();
-        serverAddress = new SimpleStringProperty();
+        this.messageList = messageList;
-        serverPort = new SimpleIntegerProperty();
+        this.connection = NetworkHandler.openConnection(serverAddress,serverPort);
     }
 
-    public SimpleStringProperty getServerAddressProperty() { return serverAddress; }
+    public ObjectProperty<State> getStateObjectProperty() {
-
+        return stateObjectProperty;
-    public SimpleIntegerProperty getServerPortProperty() { return serverPort; }
-
-    public SimpleObjectProperty<State> getStateProperty() {
-        return this.state;
     }
 
-    public SimpleStringProperty getUserNameProperty() { return userName; }
+    public SimpleStringProperty getUserNameProperty() {
+        return userName;
+    }
+
+    public SimpleStringProperty getServerAddressProperty() {
+        return serverAddress;
+    }
+
+    public SimpleIntegerProperty getServerPortProperty() {
+        return serverPort;
+    }
 
     public void setState (State newState) {
-        state.set(newState);
+        this.stateObjectProperty.set(newState);
-
     }
 
     public void run () {
@@ -107,6 +111,7 @@ public class ClientConnectionHandler implements Runnable {
         System.out.println("Closed Connection Handler to Server");
     }
 
+
     private void processData(String data) {
         try {
             // parse data content
@@ -137,37 +142,37 @@ public class ClientConnectionHandler implements Runnable {
             if (type.equals(DATA_TYPE_CONNECT)) {
                 System.err.println("Illegal connect request from server");
             } else if (type.equals(DATA_TYPE_CONFIRM)) {
-                if (state.get() == CONFIRM_CONNECT) {
+                if (stateObjectProperty.get() == CONFIRM_CONNECT) {
                     this.userName.set(reciever);
-                    this.serverPort.set(connection.getRemotePort());
                     this.serverAddress.set(connection.getRemoteHost());
-                    messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
+                    this.serverPort.set(connection.getRemotePort());
+                    messageList.addMessage(sender,reciever,payload,INFO);
                     System.out.println("CONFIRM: " + payload);
                     this.setState(CONNECTED);
-                } else if (state.get() == CONFIRM_DISCONNECT) {
+                } else if (stateObjectProperty.get() == CONFIRM_DISCONNECT) {
-                    messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
+                    messageList.addMessage(sender,reciever,payload,INFO);
                     System.out.println("CONFIRM: " + payload);
                     this.setState(DISCONNECTED);
                 } else {
                     System.err.println("Got unexpected confirm message: " + payload);
                 }
             } else if (type.equals(DATA_TYPE_DISCONNECT)) {
-                if (state.get() == DISCONNECTED) {
+                if (stateObjectProperty.get() == DISCONNECTED) {
                     System.out.println("DISCONNECT: Already in disconnected: " + payload);
                     return;
                 }
-                messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
+                messageList.addMessage(sender,reciever,payload,INFO);
                 System.out.println("DISCONNECT: " + payload);
                 this.setState(DISCONNECTED);
             } else if (type.equals(DATA_TYPE_MESSAGE)) {
-                if (state.get() != CONNECTED) {
+                if (stateObjectProperty.get() != CONNECTED) {
-                    System.out.println("MESSAGE: Illegal state " + state + " for message: " + payload);
+                    System.out.println("MESSAGE: Illegal state " + stateObjectProperty.get() + " for message: " + payload);
                     return;
                 }
-                messages.addMessage(new Message(Message.MessageType.MESSAGE,sender,reciever,payload));
+                messageList.addMessage(sender,reciever,payload,MESSAGE);
                 System.out.println("MESSAGE: From " + sender + " to " + reciever + ": "+  payload);
             } else if (type.equals(DATA_TYPE_ERROR)) {
-                messages.addMessage(new Message(Message.MessageType.ERROR,sender,reciever,payload));
+                messageList.addMessage(sender,reciever,payload,ERROR);
                 System.out.println("ERROR: " + payload);
             } else {
                 System.out.println("Unknown data type received: " + type);
@@ -200,19 +205,19 @@ public class ClientConnectionHandler implements Runnable {
     }
 
     public void connect() throws ChatProtocolException {
-        if (state.get() != NEW) throw new ChatProtocolException("Illegal state for connect: " + state);
+        if (stateObjectProperty.get() != NEW) throw new ChatProtocolException("Illegal state for connect: " + stateObjectProperty.get());
         this.sendData(userName.get(), USER_NONE, DATA_TYPE_CONNECT,null);
         this.setState(CONFIRM_CONNECT);
     }
 
     public void disconnect() throws ChatProtocolException {
-        if (state.get() != NEW && state.get() != CONNECTED) throw new ChatProtocolException("Illegal state for disconnect: " + state);
+        if (stateObjectProperty.get() != NEW && stateObjectProperty.get() != CONNECTED) throw new ChatProtocolException("Illegal state for disconnect: " + stateObjectProperty.get());
         this.sendData(userName.get(), USER_NONE, DATA_TYPE_DISCONNECT,null);
         this.setState(CONFIRM_DISCONNECT);
     }
 
     public boolean message(String messageString) throws ChatProtocolException {
-        if (state.get() != CONNECTED) throw new ChatProtocolException("Illegal state for message: " + state);
+        if (stateObjectProperty.get() != CONNECTED) throw new ChatProtocolException("Illegal state for message: " + stateObjectProperty.get());
 
         Matcher matcher = messagePattern.matcher(messageString);
         if (matcher.find()) {

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

@@ -1,16 +1,33 @@
 package ch.zhaw.pm2.multichat.client;
 
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class ClientMessageList {
+import static ch.zhaw.pm2.multichat.client.ClientConnectionHandler.USER_NONE;
-    private List<Message> messages = new ArrayList<>();
-    private SimpleBooleanProperty changed = new SimpleBooleanProperty(false);
 
-    public void addMessage(Message message) {
+public class ClientMessageList {
-	    messages.add(message);
+    private List<Message> messages;
+    private SimpleBooleanProperty changed;
+
+    public ClientMessageList() {
+        messages = new ArrayList<>();
+        changed = new SimpleBooleanProperty(true);
+    }
+
+    public SimpleBooleanProperty getChangedProperty() {
+        return changed;
+    }
+
+    public void addMessage(String sender, String receiver, String message, Message.MessageType type) {
+        if(sender == null) {
+            sender = USER_NONE;
+        }
+        messages.add(new Message(type, sender, receiver, message));
         changed.set(!changed.get());
     }
 
@@ -31,11 +48,21 @@ public class ClientMessageList {
         return result.toString();
 	}
 
+	public String getMessages() {
+        StringBuilder result = new StringBuilder();
+        for(Message message : messages) {
+            switch (message.getType()) {
+                case MESSAGE -> result.append(String.format("[%s -> %s] %s\n", message.getSender(), message.getReceiver(), message.getText()));
+                case ERROR -> result.append(String.format("[ERROR] %s\n", message.getText()));
+                case INFO -> result.append(String.format("[INFO] %s\n", message.getText()));
+                default -> result.append(String.format("[ERROR] %s\n", "Unexpected message type: " + message.getType()));
+            }
+        }
+        return result.toString();
+    }
+
     public void clear() {
-        messages = new ArrayList<>();
+        messages = new SimpleListProperty<>();
-        changed.set(!changed.get());
     }
 
-    public SimpleBooleanProperty getChangedProperty() { return changed; }
-
 }

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

@@ -17,10 +17,8 @@ public class ClientUI extends Application {
     private void chatWindow(Stage primaryStage) {
         try {
             FXMLLoader loader = new FXMLLoader(getClass().getResource("ChatWindow.fxml"));
-            Pane rootPane = loader.load();
 
-            ChatWindowController chatWindowController = loader.getController();
+            Pane rootPane = loader.load();
-            chatWindowController.setMessages(clientMessageList);
 
             // fill in scene and stage setup
             Scene scene = new Scene(rootPane);

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

@@ -6,8 +6,6 @@ import java.io.IOException;
 import java.net.SocketException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
 
 
 public class Server {
@@ -64,34 +62,23 @@ public class Server {
     }
 
     private void start() {
-        ReentrantLock mutex = new ReentrantLock();
-        Condition nameComplete = mutex.newCondition();
         System.out.println("Server started.");
         try {
             while (true) {
                  NetworkHandler.NetworkConnection<String> connection = networkServer.waitForConnection();
-                 ServerConnectionHandler connectionHandler = new ServerConnectionHandler(connection, connections, mutex, nameComplete);
+                 ServerConnectionHandler connectionHandler = new ServerConnectionHandler(connection, connections);
                  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) {
             System.err.println("Communication error " + e);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
         }
         // close server
         System.out.println("Server Stopped.");

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

@@ -11,8 +11,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Scanner;
 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.*;
 
@@ -32,10 +30,6 @@ public class ServerConnectionHandler implements Runnable{
     private static final String USER_NONE = "";
     private static final String USER_ALL = "*";
 
-    private ReentrantLock mutex;
-
-    private Condition nameComplete;
-
     private String userName = "Anonymous-"+connectionId;
     private State state = NEW;
 
@@ -49,13 +43,11 @@ public class ServerConnectionHandler implements Runnable{
     }
 
     public ServerConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
-                                   Map<String,ServerConnectionHandler> registry, ReentrantLock mutex, Condition nameComplete) {
+                                   Map<String,ServerConnectionHandler> registry) {
         Objects.requireNonNull(connection, "Connection must not be null");
         Objects.requireNonNull(registry, "Registry must not be null");
         this.connection = connection;
         this.connectionRegistry = registry;
-        this.mutex = mutex;
-        this.nameComplete = nameComplete;
     }
 
     public String getUserName() {
@@ -63,7 +55,7 @@ public class ServerConnectionHandler implements Runnable{
     }
 
     public void startReceiving() {
-            System.out.println("Starting Connection Handler for new User");
+        System.out.println("Starting Connection Handler for " + userName);
         try {
             System.out.println("Start receiving data...");
             while (connection.isAvailable()) {
@@ -85,7 +77,6 @@ public class ServerConnectionHandler implements Runnable{
             System.err.println("Received object of unknown type: " + e.getMessage());
         }
         System.out.println("Stopping Connection Handler for " + userName);
-
     }
 
     public void stopReceiving() {
@@ -133,14 +124,7 @@ public class ServerConnectionHandler implements Runnable{
                 if (sender == null || sender.isBlank()) sender = this.userName;
                 if (connectionRegistry.containsKey(sender))
                     throw new ChatProtocolException("User name already taken: " + sender);
-                mutex.lock();
-                try {
                 this.userName = sender;
-                    nameComplete.signal();
-                }
-                finally {
-                    mutex.unlock();
-                }
                 connectionRegistry.put(userName, this);
                 sendData(USER_NONE, userName, DATA_TYPE_CONFIRM, "Registration successfull for " + userName);
                 this.state = CONNECTED;
@@ -165,9 +149,6 @@ public class ServerConnectionHandler implements Runnable{
                     ServerConnectionHandler handler = connectionRegistry.get(reciever);
                     if (handler != null) {
                         handler.sendData(sender, reciever, type, payload);
-                        if(!reciever.equals(sender)){
-                            sendData(sender, reciever, type, payload); //send message to sender if it's a direct message and sender is not receiver.
-                        }
                     } else {
                         this.sendData(USER_NONE, userName, DATA_TYPE_ERROR, "Unknown User: " + reciever);
                     }