Changes after coderabbit review

Author: fredrikmohlen

src/main/java/com/example/HelloController.java

@@ -35,33 +35,29 @@ 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() {
         return List -> new ListCell<>() {
             @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();
+        }
     }
-
 }
 

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;

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();
+        }
     }
+
 }
 
 

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);
 }

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) {

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
+){}

src/main/resources/css/style.css

@@ -3,47 +3,38 @@
 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{
     -fx-background-color: transparent;
     -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;
 }

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å");
 
     }