From 768fd401c3e345a441e100124425eb4b6df13c2a Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Mon, 3 Nov 2025 08:46:11 +0100
Subject: [PATCH 01/13] Chatwindow updates sending text

---
 .../java/com/example/HelloController.java     | 21 +++++++++
 .../resources/com/example/hello-view.fxml     | 44 +++++++++++++++----
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index fdd160a0..dbdb59be 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -1,7 +1,9 @@
 package com.example;
 
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
 
 /**
  * Controller layer: mediates between the view (FXML) and the model.
@@ -10,6 +12,15 @@ public class HelloController {
 
     private final HelloModel model = new HelloModel();
 
+    @FXML
+    private TextArea myTextArea;
+
+    @FXML
+    private TextArea chatArea;
+
+    @FXML
+    private Button chatButton;
+
     @FXML
     private Label messageLabel;
 
@@ -18,5 +29,15 @@ private void initialize() {
         if (messageLabel != null) {
             messageLabel.setText(model.getGreeting());
         }
+        chatButton.setOnAction(event -> {
+            String input = chatArea.getText().trim();
+            if (!input.isEmpty()) {
+                // Lägg till texten i myTextArea
+                myTextArea.appendText(input + "\n");
+                chatArea.clear(); // Töm inmatningsfältet
+            }
+        });
     }
+
 }
+
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index 20a7dc82..013a75c4 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -1,9 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.control.Label?>
-
-<StackPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.example.HelloController">
-    <children>
-        <Label fx:id="messageLabel" text="Hello, JavaFX!" />
-    </children>
-</StackPane>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<VBox prefHeight="500.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="com.example.HelloController">
+
+    <Label fx:id="messageLabel" text="Hello, JavaFX!"/>
+    <HBox alignment="CENTER" VBox.vgrow="ALWAYS" spacing="5">
+        <Text text="left"/>
+        <TextArea fx:id="myTextArea" editable="false" wrapText="true" prefHeight="300.0" VBox.vgrow="ALWAYS">
+            <padding>
+                <Insets bottom="1.0" left="1.0" right="1.0" top="1.0"/>
+            </padding>
+        </TextArea>
+        <Text text="right"/>
+
+    </HBox>
+    <SplitPane dividerPositions="0.7"  VBox.vgrow="NEVER">
+        <items>
+            <TextArea fx:id="chatArea" wrapText="true" maxHeight="-Infinity" prefHeight="100.0" prefRowCount="3"/>
+            <Button fx:id="chatButton" prefWidth="60.0" text="Send" textAlignment="CENTER"
+                    SplitPane.resizableWithParent="false">
+                <padding>
+                    <Insets bottom="1.0" left="1.0" right="1.0" top="1.0"/>
+                </padding>
+                <font>
+                    <Font size="14.0"/>
+                </font>
+            </Button>
+        </items>
+    </SplitPane>
+
+</VBox>

From e314f01ce61863e1b740871fe72d81669ff682ff Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Mon, 3 Nov 2025 15:19:44 +0100
Subject: [PATCH 02/13] gitignore .env-file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6ac465db..244268f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 target/
 /.idea/
+.env

From 16ee02882fe090e7c372cc4ffbc71512badc61b0 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Mon, 3 Nov 2025 15:20:13 +0100
Subject: [PATCH 03/13] Updates sending and receiving

---
 pom.xml                                       | 10 +++
 .../java/com/example/HelloController.java     | 12 ++++
 src/main/java/com/example/HelloFX.java        |  2 +
 src/main/java/com/example/HelloModel.java     | 63 +++++++++++++++++++
 src/main/java/com/example/NtfyMessageDto.java |  6 ++
 src/main/java/module-info.java                |  3 +
 .../resources/com/example/hello-view.fxml     |  2 +
 7 files changed, 98 insertions(+)
 create mode 100644 src/main/java/com/example/NtfyMessageDto.java

diff --git a/pom.xml b/pom.xml
index c40f667e..9ee23793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,16 @@
             <artifactId>javafx-fxml</artifactId>
             <version>${javafx.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.cdimascio</groupId>
+            <artifactId>dotenv-java</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>tools.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>3.0.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index dbdb59be..375879b9 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -1,16 +1,21 @@
 package com.example;
 
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
 import javafx.scene.control.TextArea;
 
+import java.io.IOException;
+
 /**
  * Controller layer: mediates between the view (FXML) and the model.
  */
 public class HelloController {
 
     private final HelloModel model = new HelloModel();
+    public ListView<NtfyMessageDto> messageView;
 
     @FXML
     private TextArea myTextArea;
@@ -29,6 +34,9 @@ private void initialize() {
         if (messageLabel != null) {
             messageLabel.setText(model.getGreeting());
         }
+        // messageView.setItems(model.sendMessage());
+
+
         chatButton.setOnAction(event -> {
             String input = chatArea.getText().trim();
             if (!input.isEmpty()) {
@@ -39,5 +47,9 @@ private void initialize() {
         });
     }
 
+    public void sendMessage(ActionEvent actionEvent) throws IOException, InterruptedException {
+        model.sendMessage();
+    }
+
 }
 
diff --git a/src/main/java/com/example/HelloFX.java b/src/main/java/com/example/HelloFX.java
index 96bdc5ca..263c58ca 100644
--- a/src/main/java/com/example/HelloFX.java
+++ b/src/main/java/com/example/HelloFX.java
@@ -1,5 +1,6 @@
 package com.example;
 
+import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -10,6 +11,7 @@ public class HelloFX extends Application {
 
     @Override
     public void start(Stage stage) throws Exception {
+
         FXMLLoader fxmlLoader = new FXMLLoader(HelloFX.class.getResource("hello-view.fxml"));
         Parent root = fxmlLoader.load();
         Scene scene = new Scene(root, 640, 480);
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 385cfd10..9ea04eff 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -1,9 +1,37 @@
 package com.example;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.github.cdimascio.dotenv.Dotenv;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import tools.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.ArrayList;
+import java.util.Objects;
+
 /**
  * Model layer: encapsulates application data and business logic.
  */
 public class HelloModel {
+
+    private final String hostName;
+    private final HttpClient http = HttpClient.newHttpClient();
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    private final ObservableList<NtfyMessageDto> messages = FXCollections.observableArrayList();
+
+    public HelloModel() {
+        Dotenv dotenv = Dotenv.load();
+        hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
+        receiveMessage();
+    }
+
     /**
      * Returns a greeting based on the current Java and JavaFX versions.
      */
@@ -12,4 +40,39 @@ public String getGreeting() {
         String javafxVersion = System.getProperty("javafx.version");
         return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
     }
+
+    public void sendMessage() throws IOException, InterruptedException {
+
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .POST(HttpRequest.BodyPublishers.ofString("Tjena!"))
+                .uri(URI.create(hostName + "/mytopic"))
+                .build();
+        try {
+            // Todo: handle long blocking send request to not freeze the java FX thread
+            //1. Use thread send message?
+            //2. Use async?
+            var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException | InterruptedException e) {
+            System.out.println("Error sending message");
+        }
+
+    }
+
+    public void receiveMessage() {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .GET()
+                .uri(URI.create(hostName + "/mytopic/json"))
+                .build();
+
+        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
+                .thenAccept(response-> response.body()
+                        .map(s->mapper.readValue(s, NtfyMessageDto.class))
+                        .peek(System.out::println)
+                        .filter(message->message.event().equals("message"))
+                        .forEach(s->
+                                Platform.runLater(()-> messages.add(s))));
+
+    }
 }
+
+
diff --git a/src/main/java/com/example/NtfyMessageDto.java b/src/main/java/com/example/NtfyMessageDto.java
new file mode 100644
index 00000000..a80255c4
--- /dev/null
+++ b/src/main/java/com/example/NtfyMessageDto.java
@@ -0,0 +1,6 @@
+package com.example;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record NtfyMessageDto(String id,long time, String event, String topic, String message){}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 71574a27..649be1ab 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,6 +1,9 @@
 module hellofx {
     requires javafx.controls;
     requires javafx.fxml;
+    requires io.github.cdimascio.dotenv.java;
+    requires java.net.http;
+    requires tools.jackson.databind;
 
     opens com.example to javafx.fxml;
     exports com.example;
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index 013a75c4..fd82d245 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -12,6 +12,7 @@
     <HBox alignment="CENTER" VBox.vgrow="ALWAYS" spacing="5">
         <Text text="left"/>
         <TextArea fx:id="myTextArea" editable="false" wrapText="true" prefHeight="300.0" VBox.vgrow="ALWAYS">
+            <ListView fx:id="messageView" />
             <padding>
                 <Insets bottom="1.0" left="1.0" right="1.0" top="1.0"/>
             </padding>
@@ -31,6 +32,7 @@
                     <Font size="14.0"/>
                 </font>
             </Button>
+            <Button text = "send message" onAction="#sendMessage" />
         </items>
     </SplitPane>
 

From 5ff126e6a1770d58127b0b221b20351740812dda Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Thu, 6 Nov 2025 09:32:43 +0100
Subject: [PATCH 04/13] Updates sending and receiving

---
 pom.xml                                       |  6 ++
 .../java/com/example/HelloController.java     | 32 ++++++---
 src/main/java/com/example/HelloModel.java     | 54 +++++++--------
 src/main/java/com/example/NtfyConnection.java | 10 +++
 .../java/com/example/NtfyConnectionImpl.java  | 67 +++++++++++++++++++
 src/main/java/module-info.java                |  1 +
 .../resources/com/example/hello-view.fxml     | 17 ++---
 src/test/java/com/example/HelloModelTest.java | 45 +++++++++++++
 .../java/com/example/NtfyConnectionSpy.java   | 19 ++++++
 9 files changed, 197 insertions(+), 54 deletions(-)
 create mode 100644 src/main/java/com/example/NtfyConnection.java
 create mode 100644 src/main/java/com/example/NtfyConnectionImpl.java
 create mode 100644 src/test/java/com/example/HelloModelTest.java
 create mode 100644 src/test/java/com/example/NtfyConnectionSpy.java

diff --git a/pom.xml b/pom.xml
index 9ee23793..507a44b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,12 @@
             <artifactId>jackson-databind</artifactId>
             <version>3.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>4.0.0-beta.15</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index 375879b9..fa35b3ac 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -2,10 +2,8 @@
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
-import javafx.scene.control.TextArea;
+import javafx.scene.control.*;
+import javafx.util.Callback;
 
 import java.io.IOException;
 
@@ -14,7 +12,7 @@
  */
 public class HelloController {
 
-    private final HelloModel model = new HelloModel();
+    private final HelloModel model = new HelloModel(new NtfyConnectionImpl());
     public ListView<NtfyMessageDto> messageView;
 
     @FXML
@@ -34,19 +32,33 @@ private void initialize() {
         if (messageLabel != null) {
             messageLabel.setText(model.getGreeting());
         }
-        // messageView.setItems(model.sendMessage());
-
+       messageView.setItems(model.getMessages());
+       messageView.setCellFactory(showOnlyMessages());
 
         chatButton.setOnAction(event -> {
             String input = chatArea.getText().trim();
             if (!input.isEmpty()) {
-                // Lägg till texten i myTextArea
-                myTextArea.appendText(input + "\n");
-                chatArea.clear(); // Töm inmatningsfältet
+                model.setMessageToSend(input);
+                model.sendMessage();
+                chatArea.clear();
             }
         });
     }
 
+    private static Callback<ListView<NtfyMessageDto>, ListCell<NtfyMessageDto>> showOnlyMessages() {
+        return List -> new ListCell<>() {
+            @Override
+            protected void updateItem(NtfyMessageDto item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty) {
+                    setText(null);
+                } else {
+                    setText(getItem().message());
+                }
+            }
+        };
+    }
+
     public void sendMessage(ActionEvent actionEvent) throws IOException, InterruptedException {
         model.sendMessage();
     }
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 9ea04eff..c0489b77 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import tools.jackson.databind.ObjectMapper;
@@ -20,15 +22,13 @@
  */
 public class HelloModel {
 
-    private final String hostName;
-    private final HttpClient http = HttpClient.newHttpClient();
-    private final ObjectMapper mapper = new ObjectMapper();
+    private final NtfyConnection connection;
 
     private final ObservableList<NtfyMessageDto> messages = FXCollections.observableArrayList();
+    private final StringProperty messageToSend = new SimpleStringProperty();
 
-    public HelloModel() {
-        Dotenv dotenv = Dotenv.load();
-        hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
+    public HelloModel(NtfyConnection connection) {
+        this.connection = connection;
         receiveMessage();
     }
 
@@ -40,38 +40,30 @@ public String getGreeting() {
         String javafxVersion = System.getProperty("javafx.version");
         return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
     }
+    public ObservableList<NtfyMessageDto> getMessages() {
+                return messages;
+    }
 
-    public void sendMessage() throws IOException, InterruptedException {
+    public String getMessageToSend() {
+        return messageToSend.get();
+    }
 
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString("Tjena!"))
-                .uri(URI.create(hostName + "/mytopic"))
-                .build();
-        try {
-            // Todo: handle long blocking send request to not freeze the java FX thread
-            //1. Use thread send message?
-            //2. Use async?
-            var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
-        } catch (IOException | InterruptedException e) {
-            System.out.println("Error sending message");
-        }
+    public StringProperty messageToSendProperty() {
+        return messageToSend;
+    }
 
+    public void setMessageToSend(String message) {
+        messageToSend.set(message);
     }
 
-    public void receiveMessage() {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .GET()
-                .uri(URI.create(hostName + "/mytopic/json"))
-                .build();
+    public void sendMessage() {
+        connection.send(messageToSend.get());
 
-        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
-                .thenAccept(response-> response.body()
-                        .map(s->mapper.readValue(s, NtfyMessageDto.class))
-                        .peek(System.out::println)
-                        .filter(message->message.event().equals("message"))
-                        .forEach(s->
-                                Platform.runLater(()-> messages.add(s))));
+}
+    public void receiveMessage() {
 
+        connection.receive(m->Platform.runLater(()-> messages.add(m)));
+//
     }
 }
 
diff --git a/src/main/java/com/example/NtfyConnection.java b/src/main/java/com/example/NtfyConnection.java
new file mode 100644
index 00000000..b9e42881
--- /dev/null
+++ b/src/main/java/com/example/NtfyConnection.java
@@ -0,0 +1,10 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public interface NtfyConnection {
+
+    public void send(String message);
+
+    public void receive(Consumer<NtfyMessageDto> messageHandler);
+}
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
new file mode 100644
index 00000000..a8086951
--- /dev/null
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -0,0 +1,67 @@
+package com.example;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import javafx.application.Platform;
+import tools.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+public class NtfyConnectionImpl implements NtfyConnection {
+
+    private final HttpClient http = HttpClient.newHttpClient();
+    private final String hostName;
+    private final ObjectMapper mapper = new ObjectMapper();
+
+
+    public NtfyConnectionImpl() {
+        Dotenv dotenv = Dotenv.load();
+        hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
+    }
+
+    public NtfyConnectionImpl(String hostName) {
+        this.hostName = hostName;
+    }
+
+    @Override
+    public void send(String message) {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .POST(HttpRequest.BodyPublishers.ofString(message)) // för att testet ska funka utan "
+                .header("Cache", "no")
+                .uri(URI.create(hostName + "/mytopic"))
+                .build();
+
+        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.discarding())
+                .thenAccept(response -> System.out.println("Message sent!"))
+                .exceptionally(e -> {
+                    System.out.println("Error sending message");
+                    return null;
+                });
+    }
+//        try {
+//            // Todo: handle long blocking send request to not freeze the java FX thread
+//            //1. Use thread send message?
+//            //2. Use async?
+
+        @Override
+        public void receive (Consumer < NtfyMessageDto > messageHandler) {
+            HttpRequest httpRequest = HttpRequest.newBuilder()
+                    .GET()
+                    .uri(URI.create(hostName + "/mytopic/json"))
+                    .build();
+
+            http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
+                    .thenAccept(response -> response.body()
+                            .map(s ->
+                                    mapper.readValue(s, NtfyMessageDto.class))
+                            .filter(message -> message.event().equals("message"))
+                            .peek(System.out::println)
+                            .forEach(messageHandler));
+        }
+    }
+
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 649be1ab..89e041cb 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -4,6 +4,7 @@
     requires io.github.cdimascio.dotenv.java;
     requires java.net.http;
     requires tools.jackson.databind;
+    requires javafx.graphics;
 
     opens com.example to javafx.fxml;
     exports com.example;
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index fd82d245..4c428cd4 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -11,28 +11,19 @@
     <Label fx:id="messageLabel" text="Hello, JavaFX!"/>
     <HBox alignment="CENTER" VBox.vgrow="ALWAYS" spacing="5">
         <Text text="left"/>
-        <TextArea fx:id="myTextArea" editable="false" wrapText="true" prefHeight="300.0" VBox.vgrow="ALWAYS">
-            <ListView fx:id="messageView" />
+        <ListView fx:id="messageView" >
             <padding>
                 <Insets bottom="1.0" left="1.0" right="1.0" top="1.0"/>
             </padding>
-        </TextArea>
+        </ListView>
         <Text text="right"/>
 
     </HBox>
     <SplitPane dividerPositions="0.7"  VBox.vgrow="NEVER">
         <items>
             <TextArea fx:id="chatArea" wrapText="true" maxHeight="-Infinity" prefHeight="100.0" prefRowCount="3"/>
-            <Button fx:id="chatButton" prefWidth="60.0" text="Send" textAlignment="CENTER"
-                    SplitPane.resizableWithParent="false">
-                <padding>
-                    <Insets bottom="1.0" left="1.0" right="1.0" top="1.0"/>
-                </padding>
-                <font>
-                    <Font size="14.0"/>
-                </font>
-            </Button>
-            <Button text = "send message" onAction="#sendMessage" />
+
+            <Button fx:id="chatButton" text="send message" onAction="#sendMessage" />
         </items>
     </SplitPane>
 
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
new file mode 100644
index 00000000..42b0fb44
--- /dev/null
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -0,0 +1,45 @@
+package com.example;
+
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static java.lang.reflect.Array.get;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+@WireMockTest
+class HelloModelTest {
+
+    @Test
+    @DisplayName("Given a model with messageToSend when calling sendMessage then send")
+    void sendMessageCallsConnectionWithMessagesToSend() {
+        //Arrange - Given
+        var spy = new NtfyConnectionSpy();
+        var model = new HelloModel(spy);
+        model.setMessageToSend("Hello World");
+        //Act - When
+        model.sendMessage();
+        //Assert - Then
+        assertThat(spy.message).isEqualTo("Hello World");
+    }
+
+    @Test
+    void sendMessageToFakeServer(WireMockRuntimeInfo wmRunTimeInfo) {
+        var con = new NtfyConnectionImpl("http://localhost:" + wmRunTimeInfo.getHttpPort());
+        var model = new HelloModel(con);
+        model.setMessageToSend("Hello World");
+        stubFor(post("/mytopic").willReturn(ok()));
+
+        model.sendMessage();
+
+        //Verify call made to server
+        WireMock.verify(postRequestedFor(urlEqualTo("/mytopic"))
+                .withRequestBody(matching("Hello World")));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
new file mode 100644
index 00000000..00c7329c
--- /dev/null
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -0,0 +1,19 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public class NtfyConnectionSpy implements NtfyConnection {
+
+    String message;
+
+    @Override
+    public void send(String message) {
+        this.message = message;
+//        return true;
+    }
+
+    @Override
+    public void receive(Consumer<NtfyMessageDto> messageHandler) {
+
+    }
+}

From d08df978ad0163e7d28ee2255365d439b11009d5 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Thu, 6 Nov 2025 10:42:04 +0100
Subject: [PATCH 05/13] second test confirmed

---
 src/main/java/com/example/HelloModel.java         | 15 +++------------
 src/main/java/com/example/NtfyConnection.java     |  3 ++-
 src/main/java/com/example/NtfyConnectionImpl.java |  7 +++----
 src/test/java/com/example/HelloModelTest.java     | 11 ++++++-----
 src/test/java/com/example/NtfyConnectionSpy.java  |  4 +++-
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index c0489b77..2052cc6c 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -1,21 +1,12 @@
 package com.example;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import tools.jackson.databind.ObjectMapper;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.util.ArrayList;
-import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * Model layer: encapsulates application data and business logic.
@@ -56,8 +47,8 @@ public void setMessageToSend(String message) {
         messageToSend.set(message);
     }
 
-    public void sendMessage() {
-        connection.send(messageToSend.get());
+    public CompletableFuture<Void> sendMessage() {
+        return connection.send(messageToSend.get());
 
 }
     public void receiveMessage() {
diff --git a/src/main/java/com/example/NtfyConnection.java b/src/main/java/com/example/NtfyConnection.java
index b9e42881..51a1a769 100644
--- a/src/main/java/com/example/NtfyConnection.java
+++ b/src/main/java/com/example/NtfyConnection.java
@@ -1,10 +1,11 @@
 package com.example;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 public interface NtfyConnection {
 
-    public void send(String message);
+    public CompletableFuture<Void> send(String message);
 
     public void receive(Consumer<NtfyMessageDto> messageHandler);
 }
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index a8086951..b4bdc026 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -1,15 +1,14 @@
 package com.example;
 
 import io.github.cdimascio.dotenv.Dotenv;
-import javafx.application.Platform;
 import tools.jackson.databind.ObjectMapper;
 
-import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 public class NtfyConnectionImpl implements NtfyConnection {
@@ -29,14 +28,14 @@ public NtfyConnectionImpl(String hostName) {
     }
 
     @Override
-    public void send(String message) {
+    public CompletableFuture<Void> send(String message) {
         HttpRequest httpRequest = HttpRequest.newBuilder()
                 .POST(HttpRequest.BodyPublishers.ofString(message)) // för att testet ska funka utan "
                 .header("Cache", "no")
                 .uri(URI.create(hostName + "/mytopic"))
                 .build();
 
-        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.discarding())
+        return http.sendAsync(httpRequest, HttpResponse.BodyHandlers.discarding())
                 .thenAccept(response -> System.out.println("Message sent!"))
                 .exceptionally(e -> {
                     System.out.println("Error sending message");
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 42b0fb44..7e00fc9c 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -1,17 +1,16 @@
 package com.example;
 
+
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
+import java.util.concurrent.ExecutionException;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static java.lang.reflect.Array.get;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 
 @WireMockTest
 class HelloModelTest {
@@ -30,16 +29,18 @@ void sendMessageCallsConnectionWithMessagesToSend() {
     }
 
     @Test
-    void sendMessageToFakeServer(WireMockRuntimeInfo wmRunTimeInfo) {
+    void sendMessageToFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws InterruptedException, ExecutionException {
         var con = new NtfyConnectionImpl("http://localhost:" + wmRunTimeInfo.getHttpPort());
         var model = new HelloModel(con);
         model.setMessageToSend("Hello World");
         stubFor(post("/mytopic").willReturn(ok()));
 
-        model.sendMessage();
+        var messageHolder = model.sendMessage();
+        messageHolder.get();
 
         //Verify call made to server
         WireMock.verify(postRequestedFor(urlEqualTo("/mytopic"))
                 .withRequestBody(matching("Hello World")));
     }
+// Test för att se att vi får meddelanden tillbaka. receiveMessage?
 }
\ No newline at end of file
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
index 00c7329c..666f48db 100644
--- a/src/test/java/com/example/NtfyConnectionSpy.java
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -1,5 +1,6 @@
 package com.example;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 public class NtfyConnectionSpy implements NtfyConnection {
@@ -7,9 +8,10 @@ public class NtfyConnectionSpy implements NtfyConnection {
     String message;
 
     @Override
-    public void send(String message) {
+    public CompletableFuture<Void> send(String message) {
         this.message = message;
 //        return true;
+        return null;
     }
 
     @Override

From d555609a4df6c629121a9ed10728c8ed99d79722 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Mon, 10 Nov 2025 15:47:39 +0100
Subject: [PATCH 06/13] updates

---
 src/main/java/com/example/HelloModel.java     |  2 +-
 .../java/com/example/NtfyConnectionImpl.java  |  3 +-
 .../resources/com/example/hello-view.fxml     | 12 ++--
 src/main/resources/css/style.css              | 60 +++++++++++++++++++
 src/test/java/com/example/HelloModelTest.java | 53 ++++++++++++++++
 .../java/com/example/NtfyConnectionSpy.java   |  8 ++-
 6 files changed, 126 insertions(+), 12 deletions(-)
 create mode 100644 src/main/resources/css/style.css

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 2052cc6c..3292dab1 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -49,8 +49,8 @@ public void setMessageToSend(String message) {
 
     public CompletableFuture<Void> sendMessage() {
         return connection.send(messageToSend.get());
-
 }
+
     public void receiveMessage() {
 
         connection.receive(m->Platform.runLater(()-> messages.add(m)));
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index b4bdc026..6e09960b 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -30,7 +30,7 @@ public NtfyConnectionImpl(String hostName) {
     @Override
     public CompletableFuture<Void> send(String message) {
         HttpRequest httpRequest = HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString(message)) // för att testet ska funka utan "
+                .POST(HttpRequest.BodyPublishers.ofString(message))
                 .header("Cache", "no")
                 .uri(URI.create(hostName + "/mytopic"))
                 .build();
@@ -42,7 +42,6 @@ public CompletableFuture<Void> send(String message) {
                     return null;
                 });
     }
-//        try {
 //            // Todo: handle long blocking send request to not freeze the java FX thread
 //            //1. Use thread send message?
 //            //2. Use async?
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index 4c428cd4..3f9d58d2 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -5,20 +5,20 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 
-<VBox prefHeight="500.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1"
+<VBox stylesheets="@../../css/style.css" prefHeight="500.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1"
       fx:controller="com.example.HelloController">
 
     <Label fx:id="messageLabel" text="Hello, JavaFX!"/>
-    <HBox alignment="CENTER" VBox.vgrow="ALWAYS" spacing="5">
-        <Text text="left"/>
-        <ListView fx:id="messageView" >
+    <BorderPane VBox.vgrow="ALWAYS" >
+<center>
+        <ListView  fx:id="messageView" >
             <padding>
                 <Insets bottom="1.0" left="1.0" right="1.0" top="1.0"/>
             </padding>
         </ListView>
-        <Text text="right"/>
+</center>
 
-    </HBox>
+    </BorderPane>
     <SplitPane dividerPositions="0.7"  VBox.vgrow="NEVER">
         <items>
             <TextArea fx:id="chatArea" wrapText="true" maxHeight="-Infinity" prefHeight="100.0" prefRowCount="3"/>
diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
new file mode 100644
index 00000000..40087e15
--- /dev/null
+++ b/src/main/resources/css/style.css
@@ -0,0 +1,60 @@
+
+/*
+styles.css
+ */
+.root {
+   /* -fx-background-color: linear-gradient(to bottom, #8b0000, #ffd700);*/
+    -fx-background-color: #ffffff, linear-gradient(to bottom, #8b0000, #ffd700);
+    -fx-background-insets: 0, 5;
+    -fx-background-radius: 0, 10;
+}
+/*.list-view{*/
+/*    -fx-background-color: linear-gradient(to bottom, #8b0000, #ffd700);*/
+/*}*/
+.list-view {
+    -fx-background-color: transparent; /* Gör bakgrunden transparent */
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+    -fx-border-color: transparent;     /* Ta bort kantlinje */
+    /* ... (tidigare stilar) */
+    -fx-background-radius: 5;      /* Rundade hörn */
+    -fx-border-radius: 5;
+}
+/* Ta bort bakgrund och kantlinje när musen är över */
+.list-cell:filled:hover {
+    -fx-background-color: #e0e0e0;
+    -fx-text-fill: #000000;
+}
+
+/* ------------------------------------------------------------------- */
+/* 3. STYLA DEN MARKERADE CELLEN (SELECTED) */
+/* ------------------------------------------------------------------- */
+.list-cell:filled:selected {
+    /* En modern, accentuerad bakgrundsfärg (t.ex. blå) */
+    -fx-background-color: #007bff;
+    -fx-text-fill: white;          /* Vit text för hög kontrast */
+
+    /* Lägg till en liten inre skugga för djup */
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
+}
+
+/* Ta bort kantlinje när man är markerad */
+.list-cell:filled:selected .text {
+    -fx-font-weight: bold;
+}
+.text-area{
+    -fx-padding: 10px 20px;
+    -fx-text-fill: black;
+    -fx-border-color: #ffd700 #ffd700 #ffd700;
+}
+.button{
+    -fx-background-color: #007bff;
+    -fx-text-fill: white;
+    -fx-font-size: 16px;
+    -fx-padding: 10px 20px;
+    -fx-background-radius: 5px;
+    -fx-transition: background-color 0.3s ease;
+}
+.button:hover{
+    -fx-background-color: #0056b3;
+}
\ No newline at end of file
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 7e00fc9c..7e8b8045 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -4,6 +4,7 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -12,6 +13,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
+
 @WireMockTest
 class HelloModelTest {
 
@@ -43,4 +45,55 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws Interrupt
                 .withRequestBody(matching("Hello World")));
     }
 // Test för att se att vi får meddelanden tillbaka. receiveMessage?
+    @Test
+    void checkReceivedMessagesAfterSendingAMessage () throws InterruptedException {
+        //Arrange
+        var conImp = new NtfyConnectionImpl();
+        var model = new HelloModel(conImp);
+        model.setMessageToSend("Hello Worl");
+        //Act - When
+
+        model.sendMessage();
+
+        model.receiveMessage();
+        Thread.sleep(1000);
+      var messageList = model.getMessages();
+        Thread.sleep(2000);
+        assertThat(messageList).toString().contains("Hello World");
+        System.out.println(messageList);
+        // Hämta meddelandet från serven?
+        //Assert - Then
+        //assertThat().containsExactly("Hello World");
+    }
+    @Test
+    void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws InterruptedException {
+        // Arrange
+        var conImp = new NtfyConnectionImpl("http://localhost:" + wmRunTimeInfo.getHttpPort());
+        var model = new HelloModel(conImp);
+        model.setMessageToSend("Hello Worl");
+
+        stubFor(post("/mytopic").willReturn(ok()));
+        stubFor(get("/mytopic/json")
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody("{\"event\":\"message\",\"message\":\"Hello World\"}\n")));
+        // Act
+        model.sendMessage().join(); // Vänta på att meddelandet skickas
+        model.receiveMessage();
+        Thread.sleep(500);
+        // Assert
+        assertThat(model.getMessages().toString()).contains("Hello World");
+    }
+
+    // Test som skickar in ett fake:at meddelande via record och kollar att meddelandet finns i observablelistan
+    @Test
+    void checkThatReceivedFakeMessageAppearInList(){
+        var spy = new NtfyConnectionSpy();
+        var model = new HelloModel(spy);
+
+        //Skapa ett meddelande genom en record och skicka den till listan
+        new NtfyMessageDto("id1",1746598362,"message","fmtopic","Hallå");
+        spy.receive();
+        // kontrollera att Meddelandet finns i listan
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
index 666f48db..6d7302ac 100644
--- a/src/test/java/com/example/NtfyConnectionSpy.java
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -6,16 +6,18 @@
 public class NtfyConnectionSpy implements NtfyConnection {
 
     String message;
+    private Consumer<NtfyMessageDto> messageHandler;
+
 
     @Override
     public CompletableFuture<Void> send(String message) {
         this.message = message;
-//        return true;
-        return null;
+        return CompletableFuture.completedFuture(null);
     }
 
     @Override
     public void receive(Consumer<NtfyMessageDto> messageHandler) {
-
+        this.messageHandler = messageHandler;
     }
+
 }

From db7c52e21fee33b838652b8ced2964edb1eca673 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Tue, 11 Nov 2025 15:12:06 +0100
Subject: [PATCH 07/13] transparent listview(listcells) two tests checked

---
 src/main/resources/css/style.css              |  5 ++
 src/test/java/com/example/HelloModelTest.java | 47 ++++++++++++++-----
 .../java/com/example/NtfyConnectionSpy.java   |  5 ++
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
index 40087e15..2a622063 100644
--- a/src/main/resources/css/style.css
+++ b/src/main/resources/css/style.css
@@ -20,6 +20,11 @@ styles.css
     -fx-background-radius: 5;      /* Rundade hörn */
     -fx-border-radius: 5;
 }
+.list-cell{
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+    -fx-control-inner-background: transparent;
+}
 /* Ta bort bakgrund och kantlinje när musen är över */
 .list-cell:filled:hover {
     -fx-background-color: #e0e0e0;
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 7e8b8045..4db2272b 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -4,7 +4,9 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import javafx.application.Platform;
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -17,6 +19,19 @@
 @WireMockTest
 class HelloModelTest {
 
+    /**
+     * Initierar JavaFX Toolkit en gång innan alla tester i klassen.
+     */
+    @BeforeAll
+    public static void initToolkit() {
+        // Kontrollera om Toolkiten redan är igång för att undvika IllegalStateException
+        try {
+            Platform.startup(() -> {});
+        } catch (IllegalStateException e) {
+            // Toolkit är redan igång, ignorera
+        }
+    }
+
     @Test
     @DisplayName("Given a model with messageToSend when calling sendMessage then send")
     void sendMessageCallsConnectionWithMessagesToSend() {
@@ -44,27 +59,27 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws Interrupt
         WireMock.verify(postRequestedFor(urlEqualTo("/mytopic"))
                 .withRequestBody(matching("Hello World")));
     }
+
 // Test för att se att vi får meddelanden tillbaka. receiveMessage?
     @Test
     void checkReceivedMessagesAfterSendingAMessage () throws InterruptedException {
         //Arrange
         var conImp = new NtfyConnectionImpl();
         var model = new HelloModel(conImp);
-        model.setMessageToSend("Hello Worl");
+        model.setMessageToSend("Hello World");
         //Act - When
 
         model.sendMessage();
 
         model.receiveMessage();
         Thread.sleep(1000);
-      var messageList = model.getMessages();
-        Thread.sleep(2000);
-        assertThat(messageList).toString().contains("Hello World");
-        System.out.println(messageList);
-        // Hämta meddelandet från serven?
-        //Assert - Then
-        //assertThat().containsExactly("Hello World");
+        var messageList = model.getMessages();
+        //Assert
+        assertThat(messageList).extracting(NtfyMessageDto::message).contains("Hello World");
+
+
     }
+
     @Test
     void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws InterruptedException {
         // Arrange
@@ -82,7 +97,8 @@ void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo
         model.receiveMessage();
         Thread.sleep(500);
         // Assert
-        assertThat(model.getMessages().toString()).contains("Hello World");
+        System.out.println(model.getMessages());
+        //assertThat(model.getMessages().toString()).contains("Hello World");
     }
 
     // Test som skickar in ett fake:at meddelande via record och kollar att meddelandet finns i observablelistan
@@ -92,8 +108,17 @@ void checkThatReceivedFakeMessageAppearInList(){
         var model = new HelloModel(spy);
 
         //Skapa ett meddelande genom en record och skicka den till listan
-        new NtfyMessageDto("id1",1746598362,"message","fmtopic","Hallå");
-        spy.receive();
+        var fakeMessage = new NtfyMessageDto("id1",1746598362,"message","fmtopic","Hallå");
+        spy.simulateIncomingMessage(fakeMessage);
+
         // kontrollera att Meddelandet finns i listan
+        System.out.println(fakeMessage);
+        assertThat(model.getMessages()).extracting(NtfyMessageDto::message).contains("Hallå");
+
+//        assertThat(model.getMessages().stream()
+//                .sorted()
+//                .map(NtfyMessageDto::message) // <-- Hämta fältet som innehåller "Hallå"
+//                .toList()) // Alternativt .collect(Collectors.toList())
+//                .containsExactly("Hallå"); // <-- Jämför med det förväntade värdet
     }
 }
\ No newline at end of file
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
index 6d7302ac..bd6ebf6f 100644
--- a/src/test/java/com/example/NtfyConnectionSpy.java
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -20,4 +20,9 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) {
         this.messageHandler = messageHandler;
     }
 
+
+    public void simulateIncomingMessage(NtfyMessageDto messageDto){
+        if (messageHandler != null)
+            messageHandler.accept(messageDto);
+    }
 }

From 13ed7b9bac7fb0cf1a4215a990806da1a3971901 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Tue, 11 Nov 2025 16:50:09 +0100
Subject: [PATCH 08/13] 5/5 tests passed

---
 src/test/java/com/example/HelloModelTest.java | 43 ++++++++-----------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 4db2272b..4e0ab46b 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -26,7 +26,8 @@ class HelloModelTest {
     public static void initToolkit() {
         // Kontrollera om Toolkiten redan är igång för att undvika IllegalStateException
         try {
-            Platform.startup(() -> {});
+            Platform.startup(() -> {
+            });
         } catch (IllegalStateException e) {
             // Toolkit är redan igång, ignorera
         }
@@ -60,9 +61,9 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws Interrupt
                 .withRequestBody(matching("Hello World")));
     }
 
-// Test för att se att vi får meddelanden tillbaka. receiveMessage?
+    // Test för att se att vi får meddelanden tillbaka. receiveMessage?
     @Test
-    void checkReceivedMessagesAfterSendingAMessage () throws InterruptedException {
+    void checkReceivedMessagesAfterSendingAMessageToServer() throws InterruptedException {
         //Arrange
         var conImp = new NtfyConnectionImpl();
         var model = new HelloModel(conImp);
@@ -72,53 +73,45 @@ void checkReceivedMessagesAfterSendingAMessage () throws InterruptedException {
         model.sendMessage();
 
         model.receiveMessage();
+
         Thread.sleep(1000);
+
         var messageList = model.getMessages();
         //Assert
         assertThat(messageList).extracting(NtfyMessageDto::message).contains("Hello World");
-
-
     }
 
     @Test
     void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws InterruptedException {
         // Arrange
         var conImp = new NtfyConnectionImpl("http://localhost:" + wmRunTimeInfo.getHttpPort());
-        var model = new HelloModel(conImp);
-        model.setMessageToSend("Hello Worl");
 
-        stubFor(post("/mytopic").willReturn(ok()));
+        //stubFor(get("/mytopic/json").willReturn(ok("{\"message\":\"hej\"}")));
         stubFor(get("/mytopic/json")
                 .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody("{\"event\":\"message\",\"message\":\"Hello World\"}\n")));
-        // Act
-        model.sendMessage().join(); // Vänta på att meddelandet skickas
-        model.receiveMessage();
-        Thread.sleep(500);
-        // Assert
-        System.out.println(model.getMessages());
-        //assertThat(model.getMessages().toString()).contains("Hello World");
+                        .withHeader("Content-type", "application/json")
+                        .withBody("{\"event\": \"message\",\"message\": \"Hello World\", \"time\": \"12314244\"}")));
+
+        var model = new HelloModel(conImp);
+
+        Thread.sleep(1000);
+
+        assertThat(model.getMessages().getLast().message()).isEqualTo("Hello World");
+
     }
 
     // Test som skickar in ett fake:at meddelande via record och kollar att meddelandet finns i observablelistan
     @Test
-    void checkThatReceivedFakeMessageAppearInList(){
+    void checkThatReceivedFakeMessageAppearInList() {
         var spy = new NtfyConnectionSpy();
         var model = new HelloModel(spy);
 
         //Skapa ett meddelande genom en record och skicka den till listan
-        var fakeMessage = new NtfyMessageDto("id1",1746598362,"message","fmtopic","Hallå");
+        var fakeMessage = new NtfyMessageDto("id1", 1746598362, "message", "fmtopic", "Hallå");
         spy.simulateIncomingMessage(fakeMessage);
 
         // kontrollera att Meddelandet finns i listan
-        System.out.println(fakeMessage);
         assertThat(model.getMessages()).extracting(NtfyMessageDto::message).contains("Hallå");
 
-//        assertThat(model.getMessages().stream()
-//                .sorted()
-//                .map(NtfyMessageDto::message) // <-- Hämta fältet som innehåller "Hallå"
-//                .toList()) // Alternativt .collect(Collectors.toList())
-//                .containsExactly("Hallå"); // <-- Jämför med det förväntade värdet
     }
 }
\ No newline at end of file

From 483ffb217e82da8a7d9b36fc26243e06e8c8bae9 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Wed, 12 Nov 2025 11:41:42 +0100
Subject: [PATCH 09/13] more changes in tests and style

---
 pom.xml                                       |  6 ++++
 src/main/resources/css/style.css              | 11 +++++--
 src/test/java/com/example/HelloModelTest.java | 29 +++++++++++--------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 507a44b4..1bbd4424 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,12 @@
             <version>4.0.0-beta.15</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
index 2a622063..4aac740a 100644
--- a/src/main/resources/css/style.css
+++ b/src/main/resources/css/style.css
@@ -7,6 +7,7 @@ styles.css
     -fx-background-color: #ffffff, linear-gradient(to bottom, #8b0000, #ffd700);
     -fx-background-insets: 0, 5;
     -fx-background-radius: 0, 10;
+
 }
 /*.list-view{*/
 /*    -fx-background-color: linear-gradient(to bottom, #8b0000, #ffd700);*/
@@ -30,7 +31,6 @@ styles.css
     -fx-background-color: #e0e0e0;
     -fx-text-fill: #000000;
 }
-
 /* ------------------------------------------------------------------- */
 /* 3. STYLA DEN MARKERADE CELLEN (SELECTED) */
 /* ------------------------------------------------------------------- */
@@ -48,10 +48,15 @@ styles.css
     -fx-font-weight: bold;
 }
 .text-area{
-    -fx-padding: 10px 20px;
+    -fx-padding: 5px 7px;
     -fx-text-fill: black;
-    -fx-border-color: #ffd700 #ffd700 #ffd700;
+    -fx-font-size: 14;
+    -fx-border: 1px solid #ccc;
+    -fx-border-radius: 8px;
+    -fx-background-color: transparent;
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
 }
+.text-area:focus {}
 .button{
     -fx-background-color: #007bff;
     -fx-text-fill: white;
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 4e0ab46b..a27470ae 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -9,7 +9,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.awaitility.Awaitility;
 
+import java.time.Duration;
 import java.util.concurrent.ExecutionException;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
@@ -70,15 +72,16 @@ void checkReceivedMessagesAfterSendingAMessageToServer() throws InterruptedExcep
         model.setMessageToSend("Hello World");
         //Act - When
 
-        model.sendMessage();
-
-        model.receiveMessage();
-
-        Thread.sleep(1000);
+        model.sendMessage().join();
 
-        var messageList = model.getMessages();
         //Assert
-        assertThat(messageList).extracting(NtfyMessageDto::message).contains("Hello World");
+        Awaitility.await()
+                .atMost(Duration.ofSeconds(5))
+                .pollInterval(Duration.ofMillis(100))
+                .untilAsserted(() -> {
+                    assertThat(model.getMessages()).isNotEmpty();
+                    assertThat(model.getMessages().getLast().message()).contains("Hello World");
+                });
     }
 
     @Test
@@ -86,7 +89,6 @@ void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo
         // Arrange
         var conImp = new NtfyConnectionImpl("http://localhost:" + wmRunTimeInfo.getHttpPort());
 
-        //stubFor(get("/mytopic/json").willReturn(ok("{\"message\":\"hej\"}")));
         stubFor(get("/mytopic/json")
                 .willReturn(aResponse()
                         .withHeader("Content-type", "application/json")
@@ -94,10 +96,13 @@ void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo
 
         var model = new HelloModel(conImp);
 
-        Thread.sleep(1000);
-
-        assertThat(model.getMessages().getLast().message()).isEqualTo("Hello World");
-
+        Awaitility.await()
+                .atMost(Duration.ofSeconds(4))
+                .pollInterval(Duration.ofMillis(100)) // Kolla var 100:e ms
+                .untilAsserted(() -> {
+                    assertThat(model.getMessages()).isNotEmpty();
+                    assertThat(model.getMessages().getLast().message()).isEqualTo("Hello World");
+                });
     }
 
     // Test som skickar in ett fake:at meddelande via record och kollar att meddelandet finns i observablelistan

From 711e4361b0b94e89bef2bc93e32c63fdba23dcb3 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Thu, 13 Nov 2025 13:06:41 +0100
Subject: [PATCH 10/13] more changes in tests and style

---
 src/main/resources/css/style.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
index 4aac740a..e90045ca 100644
--- a/src/main/resources/css/style.css
+++ b/src/main/resources/css/style.css
@@ -5,8 +5,8 @@ styles.css
 .root {
    /* -fx-background-color: linear-gradient(to bottom, #8b0000, #ffd700);*/
     -fx-background-color: #ffffff, linear-gradient(to bottom, #8b0000, #ffd700);
-    -fx-background-insets: 0, 5;
-    -fx-background-radius: 0, 10;
+    -fx-background-insets: 0, 4;
+    -fx-background-radius: 0, 3;
 
 }
 /*.list-view{*/
@@ -48,15 +48,15 @@ styles.css
     -fx-font-weight: bold;
 }
 .text-area{
+    -fx-control-inner-background: transparent;
     -fx-padding: 5px 7px;
     -fx-text-fill: black;
     -fx-font-size: 14;
-    -fx-border: 1px solid #ccc;
+
     -fx-border-radius: 8px;
     -fx-background-color: transparent;
     -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
 }
-.text-area:focus {}
 .button{
     -fx-background-color: #007bff;
     -fx-text-fill: white;

From 6b0e7fdf91634eb090c71e9e9e9db6ca03df7feb Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Thu, 13 Nov 2025 15:17:07 +0100
Subject: [PATCH 11/13] Changes after coderabbit review

---
 .../java/com/example/HelloController.java     | 22 ++++++++----------
 src/main/java/com/example/HelloFX.java        |  1 -
 src/main/java/com/example/HelloModel.java     | 13 +++++++++--
 src/main/java/com/example/NtfyConnection.java |  4 ++--
 .../java/com/example/NtfyConnectionImpl.java  |  3 ---
 src/main/java/com/example/NtfyMessageDto.java |  8 ++++++-
 src/main/resources/css/style.css              | 23 ++++++-------------
 src/test/java/com/example/HelloModelTest.java | 21 ++++-------------
 8 files changed, 40 insertions(+), 55 deletions(-)

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index fa35b3ac..c5ecd680 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -35,14 +35,6 @@ private void initialize() {
        messageView.setItems(model.getMessages());
        messageView.setCellFactory(showOnlyMessages());
 
-        chatButton.setOnAction(event -> {
-            String input = chatArea.getText().trim();
-            if (!input.isEmpty()) {
-                model.setMessageToSend(input);
-                model.sendMessage();
-                chatArea.clear();
-            }
-        });
     }
 
     private static Callback<ListView<NtfyMessageDto>, ListCell<NtfyMessageDto>> showOnlyMessages() {
@@ -50,18 +42,22 @@ private static Callback<ListView<NtfyMessageDto>, ListCell<NtfyMessageDto>> show
             @Override
             protected void updateItem(NtfyMessageDto item, boolean empty) {
                 super.updateItem(item, empty);
-                if (empty) {
+                if (empty || item == null) {
                     setText(null);
                 } else {
-                    setText(getItem().message());
+                    setText(item.message());
                 }
             }
         };
     }
 
-    public void sendMessage(ActionEvent actionEvent) throws IOException, InterruptedException {
-        model.sendMessage();
+    public void sendMessage(ActionEvent actionEvent) {
+        String input = chatArea.getText().trim();
+        if (!input.isEmpty()) {
+            model.setMessageToSend(input);
+            model.sendMessage();
+            chatArea.clear();
+        }
     }
-
 }
 
diff --git a/src/main/java/com/example/HelloFX.java b/src/main/java/com/example/HelloFX.java
index 263c58ca..f37f5cb9 100644
--- a/src/main/java/com/example/HelloFX.java
+++ b/src/main/java/com/example/HelloFX.java
@@ -1,6 +1,5 @@
 package com.example;
 
-import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 3292dab1..2b453655 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -52,10 +52,19 @@ public CompletableFuture<Void> sendMessage() {
 }
 
     public void receiveMessage() {
+        connection.receive(m->runOnFx(()-> messages.add(m)));
+    }
 
-        connection.receive(m->Platform.runLater(()-> messages.add(m)));
-//
+    private static void runOnFx(Runnable task) {
+        try {
+            if (Platform.isFxApplicationThread()) task.run();
+            else Platform.runLater(task);
+        } catch (IllegalStateException notInitialized) {
+            // JavaFX toolkit not initialized (e.g., unit tests): run inline
+            task.run();
+        }
     }
+
 }
 
 
diff --git a/src/main/java/com/example/NtfyConnection.java b/src/main/java/com/example/NtfyConnection.java
index 51a1a769..55ee5b65 100644
--- a/src/main/java/com/example/NtfyConnection.java
+++ b/src/main/java/com/example/NtfyConnection.java
@@ -5,7 +5,7 @@
 
 public interface NtfyConnection {
 
-    public CompletableFuture<Void> send(String message);
+    CompletableFuture<Void> send(String message);
 
-    public void receive(Consumer<NtfyMessageDto> messageHandler);
+    void receive(Consumer<NtfyMessageDto> messageHandler);
 }
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 6e09960b..4ed78e57 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -42,9 +42,6 @@ public CompletableFuture<Void> send(String message) {
                     return null;
                 });
     }
-//            // Todo: handle long blocking send request to not freeze the java FX thread
-//            //1. Use thread send message?
-//            //2. Use async?
 
         @Override
         public void receive (Consumer < NtfyMessageDto > messageHandler) {
diff --git a/src/main/java/com/example/NtfyMessageDto.java b/src/main/java/com/example/NtfyMessageDto.java
index a80255c4..418257c8 100644
--- a/src/main/java/com/example/NtfyMessageDto.java
+++ b/src/main/java/com/example/NtfyMessageDto.java
@@ -3,4 +3,10 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record NtfyMessageDto(String id,long time, String event, String topic, String message){}
+public record NtfyMessageDto(
+        String id,
+        long time,
+        String event,
+        String topic,
+        String message
+){}
diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
index e90045ca..a56d8663 100644
--- a/src/main/resources/css/style.css
+++ b/src/main/resources/css/style.css
@@ -3,22 +3,17 @@
 styles.css
  */
 .root {
-   /* -fx-background-color: linear-gradient(to bottom, #8b0000, #ffd700);*/
     -fx-background-color: #ffffff, linear-gradient(to bottom, #8b0000, #ffd700);
     -fx-background-insets: 0, 4;
     -fx-background-radius: 0, 3;
 
 }
-/*.list-view{*/
-/*    -fx-background-color: linear-gradient(to bottom, #8b0000, #ffd700);*/
-/*}*/
 .list-view {
-    -fx-background-color: transparent; /* Gör bakgrunden transparent */
+    -fx-background-color: transparent; /* Make background transparent */
     -fx-background-insets: 0;
     -fx-padding: 0;
-    -fx-border-color: transparent;     /* Ta bort kantlinje */
-    /* ... (tidigare stilar) */
-    -fx-background-radius: 5;      /* Rundade hörn */
+    -fx-border-color: transparent;
+    -fx-background-radius: 5;
     -fx-border-radius: 5;
 }
 .list-cell{
@@ -26,24 +21,20 @@ styles.css
     -fx-border-color: transparent;
     -fx-control-inner-background: transparent;
 }
-/* Ta bort bakgrund och kantlinje när musen är över */
+/* Remove background and border on hover */
 .list-cell:filled:hover {
     -fx-background-color: #e0e0e0;
     -fx-text-fill: #000000;
 }
-/* ------------------------------------------------------------------- */
-/* 3. STYLA DEN MARKERADE CELLEN (SELECTED) */
-/* ------------------------------------------------------------------- */
+
 .list-cell:filled:selected {
-    /* En modern, accentuerad bakgrundsfärg (t.ex. blå) */
+
     -fx-background-color: #007bff;
-    -fx-text-fill: white;          /* Vit text för hög kontrast */
+    -fx-text-fill: white;
 
-    /* Lägg till en liten inre skugga för djup */
     -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
 }
 
-/* Ta bort kantlinje när man är markerad */
 .list-cell:filled:selected .text {
     -fx-font-weight: bold;
 }
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index a27470ae..e7e24044 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -21,19 +21,6 @@
 @WireMockTest
 class HelloModelTest {
 
-    /**
-     * Initierar JavaFX Toolkit en gång innan alla tester i klassen.
-     */
-    @BeforeAll
-    public static void initToolkit() {
-        // Kontrollera om Toolkiten redan är igång för att undvika IllegalStateException
-        try {
-            Platform.startup(() -> {
-            });
-        } catch (IllegalStateException e) {
-            // Toolkit är redan igång, ignorera
-        }
-    }
 
     @Test
     @DisplayName("Given a model with messageToSend when calling sendMessage then send")
@@ -98,24 +85,24 @@ void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo
 
         Awaitility.await()
                 .atMost(Duration.ofSeconds(4))
-                .pollInterval(Duration.ofMillis(100)) // Kolla var 100:e ms
+                .pollInterval(Duration.ofMillis(100))
                 .untilAsserted(() -> {
                     assertThat(model.getMessages()).isNotEmpty();
                     assertThat(model.getMessages().getLast().message()).isEqualTo("Hello World");
                 });
     }
 
-    // Test som skickar in ett fake:at meddelande via record och kollar att meddelandet finns i observablelistan
+    // Test that sends a fake message via record and verifies that the message appears in the observable list
     @Test
     void checkThatReceivedFakeMessageAppearInList() {
         var spy = new NtfyConnectionSpy();
         var model = new HelloModel(spy);
 
-        //Skapa ett meddelande genom en record och skicka den till listan
+        // Create a message through a record and send it to the list
         var fakeMessage = new NtfyMessageDto("id1", 1746598362, "message", "fmtopic", "Hallå");
         spy.simulateIncomingMessage(fakeMessage);
 
-        // kontrollera att Meddelandet finns i listan
+        // Verify that the message is in the list
         assertThat(model.getMessages()).extracting(NtfyMessageDto::message).contains("Hallå");
 
     }

From 72eee3b068b2c32d35821a7c482257101ca94d06 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Thu, 13 Nov 2025 15:38:37 +0100
Subject: [PATCH 12/13] Changes after coderabbit review

---
 src/main/java/com/example/NtfyConnectionImpl.java | 15 ++++++++++-----
 src/main/resources/css/style.css                  |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 4ed78e57..86c03571 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -17,7 +17,6 @@ public class NtfyConnectionImpl implements NtfyConnection {
     private final String hostName;
     private final ObjectMapper mapper = new ObjectMapper();
 
-
     public NtfyConnectionImpl() {
         Dotenv dotenv = Dotenv.load();
         hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
@@ -31,7 +30,7 @@ public NtfyConnectionImpl(String hostName) {
     public CompletableFuture<Void> send(String message) {
         HttpRequest httpRequest = HttpRequest.newBuilder()
                 .POST(HttpRequest.BodyPublishers.ofString(message))
-                .header("Cache", "no")
+                .header("Cache-Control", "no")
                 .uri(URI.create(hostName + "/mytopic"))
                 .build();
 
@@ -52,9 +51,15 @@ public void receive (Consumer < NtfyMessageDto > messageHandler) {
 
             http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
                     .thenAccept(response -> response.body()
-                            .map(s ->
-                                    mapper.readValue(s, NtfyMessageDto.class))
-                            .filter(message -> message.event().equals("message"))
+                            .map(s -> {
+                                try {
+                                    return mapper.readValue(s, NtfyMessageDto.class);
+                                } catch (Exception e) {
+                                    System.out.println("Failed to parse message");
+                                    return null;
+                                }
+                            })
+                            .filter(message -> message !=null && message.event().equals("message"))
                             .peek(System.out::println)
                             .forEach(messageHandler));
         }
diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
index a56d8663..69c751cc 100644
--- a/src/main/resources/css/style.css
+++ b/src/main/resources/css/style.css
@@ -20,6 +20,7 @@ styles.css
     -fx-background-color: transparent;
     -fx-border-color: transparent;
     -fx-control-inner-background: transparent;
+    -fx-font-size: 14;
 }
 /* Remove background and border on hover */
 .list-cell:filled:hover {
@@ -54,7 +55,6 @@ styles.css
     -fx-font-size: 16px;
     -fx-padding: 10px 20px;
     -fx-background-radius: 5px;
-    -fx-transition: background-color 0.3s ease;
 }
 .button:hover{
     -fx-background-color: #0056b3;

From 57f673e3349fcfea0bad3af17cc5eda8a5a632f7 Mon Sep 17 00:00:00 2001
From: Fredrik Mohlen <fredrikmohlen@gmail.com>
Date: Fri, 14 Nov 2025 12:28:37 +0100
Subject: [PATCH 13/13] Removed test that connects to real server, style
 changes

---
 .../java/com/example/HelloController.java     | 12 ++---
 .../resources/com/example/hello-view.fxml     | 33 ++++++--------
 src/main/resources/css/style.css              | 44 +++++++++----------
 src/test/java/com/example/HelloModelTest.java | 26 +----------
 4 files changed, 42 insertions(+), 73 deletions(-)

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index c5ecd680..7292a73d 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -5,7 +5,6 @@
 import javafx.scene.control.*;
 import javafx.util.Callback;
 
-import java.io.IOException;
 
 /**
  * Controller layer: mediates between the view (FXML) and the model.
@@ -13,10 +12,9 @@
 public class HelloController {
 
     private final HelloModel model = new HelloModel(new NtfyConnectionImpl());
-    public ListView<NtfyMessageDto> messageView;
 
     @FXML
-    private TextArea myTextArea;
+    private ListView<NtfyMessageDto> messageView;
 
     @FXML
     private TextArea chatArea;
@@ -32,11 +30,13 @@ private void initialize() {
         if (messageLabel != null) {
             messageLabel.setText(model.getGreeting());
         }
-       messageView.setItems(model.getMessages());
-       messageView.setCellFactory(showOnlyMessages());
-
+        messageView.setItems(model.getMessages());
+        messageView.setCellFactory(showOnlyMessages());
     }
 
+
+
+
     private static Callback<ListView<NtfyMessageDto>, ListCell<NtfyMessageDto>> showOnlyMessages() {
         return List -> new ListCell<>() {
             @Override
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index 3f9d58d2..a2135d72 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -3,28 +3,23 @@
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 
-<VBox stylesheets="@../../css/style.css" prefHeight="500.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="com.example.HelloController">
-
-    <Label fx:id="messageLabel" text="Hello, JavaFX!"/>
-    <BorderPane VBox.vgrow="ALWAYS" >
-<center>
-        <ListView  fx:id="messageView" >
-            <padding>
-                <Insets bottom="1.0" left="1.0" right="1.0" top="1.0"/>
-            </padding>
-        </ListView>
-</center>
+<VBox prefHeight="500.0" prefWidth="300.0" stylesheets="@../../css/style.css" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.HelloController">
 
+    <Label fx:id="messageLabel" alignment="CENTER" contentDisplay="CENTER" maxWidth="Infinity" text="Hello, JavaFX!" VBox.vgrow="NEVER" />
+    <BorderPane VBox.vgrow="ALWAYS">
+        <center>
+            <ListView fx:id="messageView">
+                <padding>
+                    <Insets bottom="1.0" left="1.0" right="1.0" top="1.0" />
+                </padding>
+            </ListView>
+        </center>
     </BorderPane>
-    <SplitPane dividerPositions="0.7"  VBox.vgrow="NEVER">
-        <items>
-            <TextArea fx:id="chatArea" wrapText="true" maxHeight="-Infinity" prefHeight="100.0" prefRowCount="3"/>
 
-            <Button fx:id="chatButton" text="send message" onAction="#sendMessage" />
-        </items>
-    </SplitPane>
+    <HBox VBox.vgrow="NEVER" alignment="CENTER_LEFT"> <padding> <Insets bottom="5.0" left="10.0" right="10.0" top="10.0" /></padding>
+        <TextArea fx:id="chatArea" opacity="0.8" prefRowCount="3" wrapText="true" HBox.hgrow="ALWAYS" />
+        <Button fx:id="chatButton" maxWidth="-Infinity" minWidth="-Infinity" onAction="#sendMessage" text="Send Message" />
+    </HBox>
 
 </VBox>
diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
index 69c751cc..db902cb4 100644
--- a/src/main/resources/css/style.css
+++ b/src/main/resources/css/style.css
@@ -3,9 +3,16 @@
 styles.css
  */
 .root {
-    -fx-background-color: #ffffff, linear-gradient(to bottom, #8b0000, #ffd700);
+    -fx-background-color:
+    linear-gradient(to bottom,
+            rgba(0,0,0,0.1) 0%,
+            rgba(0,0,0,0) 10%),
+    linear-gradient(to bottom,
+            #8b0000 30%,
+            #ffd700 100%);
     -fx-background-insets: 0, 4;
     -fx-background-radius: 0, 3;
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.4), 10, 0.5, 0, 0)
 
 }
 .list-view {
@@ -21,41 +28,32 @@ styles.css
     -fx-border-color: transparent;
     -fx-control-inner-background: transparent;
     -fx-font-size: 14;
-}
-/* Remove background and border on hover */
-.list-cell:filled:hover {
-    -fx-background-color: #e0e0e0;
-    -fx-text-fill: #000000;
-}
-
-.list-cell:filled:selected {
-
-    -fx-background-color: #007bff;
-    -fx-text-fill: white;
-
-    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
-}
-
-.list-cell:filled:selected .text {
     -fx-font-weight: bold;
+    -fx-padding: 5 10 5 10;
 }
 .text-area{
-    -fx-control-inner-background: transparent;
+    -fx-control-inner-background: #FFFFFF;
     -fx-padding: 5px 7px;
     -fx-text-fill: black;
     -fx-font-size: 14;
 
-    -fx-border-radius: 8px;
+    -fx-border-radius: 10;
+    -fx-background-radius: 10;
     -fx-background-color: transparent;
     -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
 }
+.text-area .content, .viewport {
+    -fx-background-radius: 8;
+    -fx-border-radius: 8;
+}
 .button{
-    -fx-background-color: #007bff;
+    -fx-background-color: #610202;
     -fx-text-fill: white;
-    -fx-font-size: 16px;
-    -fx-padding: 10px 20px;
+    -fx-font-size: 12px;
+    -fx-padding: 10 15 10 15;
     -fx-background-radius: 5px;
+    -fx-border-radius: 8px;
 }
 .button:hover{
-    -fx-background-color: #0056b3;
+    -fx-background-color: #400101;
 }
\ No newline at end of file
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index e7e24044..25897b5e 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -4,9 +4,6 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
-import javafx.application.Platform;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.awaitility.Awaitility;
@@ -50,29 +47,8 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws Interrupt
                 .withRequestBody(matching("Hello World")));
     }
 
-    // Test för att se att vi får meddelanden tillbaka. receiveMessage?
     @Test
-    void checkReceivedMessagesAfterSendingAMessageToServer() throws InterruptedException {
-        //Arrange
-        var conImp = new NtfyConnectionImpl();
-        var model = new HelloModel(conImp);
-        model.setMessageToSend("Hello World");
-        //Act - When
-
-        model.sendMessage().join();
-
-        //Assert
-        Awaitility.await()
-                .atMost(Duration.ofSeconds(5))
-                .pollInterval(Duration.ofMillis(100))
-                .untilAsserted(() -> {
-                    assertThat(model.getMessages()).isNotEmpty();
-                    assertThat(model.getMessages().getLast().message()).contains("Hello World");
-                });
-    }
-
-    @Test
-    void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws InterruptedException {
+    void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo wmRunTimeInfo) {
         // Arrange
         var conImp = new NtfyConnectionImpl("http://localhost:" + wmRunTimeInfo.getHttpPort());