rewrite after feedback

Author: gurkvatten

src/main/java/com/example/NtfyConnectionImpl.java

@@ -18,8 +18,21 @@ public class NtfyConnectionImpl implements NtfyConnection {
     private final ObjectMapper mapper = new ObjectMapper();
 
     public NtfyConnectionImpl() {
-        Dotenv dotenv = Dotenv.load();
-        hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
+        String loadedHostName = null;
+        try {
+            Dotenv dotenv = Dotenv.load();
+            loadedHostName = dotenv.get("HOST_NAME");
+        } catch (Exception e) {
+            System.err.println("WARNING: Could not load .env file for HOST_NAME. Using fallback.");
+        }
+
+        this.hostName = (loadedHostName != null)
+                ? loadedHostName
+                : "http://localhost:8080";
+
+        if (this.hostName.equals("http://localhost:8080")) {
+            System.out.println("DEBUG: NtfyConnectionImpl running in test/fallback mode.");
+        }
     }
 
     public NtfyConnectionImpl(String hostName) {
@@ -30,21 +43,23 @@ public NtfyConnectionImpl(String hostName) {
     public boolean send(String message) {
         HttpRequest httpRequest = HttpRequest.newBuilder()
                 .POST(HttpRequest.BodyPublishers.ofString(message))
-                //.header("Cache", "no")
                 .uri(URI.create(hostName + "/mytopic"))
                 .build();
-        try {
-            //Todo: handle long blocking send requests to not freeze the JavaFX thread
-            //1. Use thread send message?
-            //2. Use async?
-            var reponse = http.send(httpRequest, HttpResponse.BodyHandlers.discarding());
-            return true;
-        } catch (IOException e) {
-            System.out.println("Error sending message");
-        } catch (InterruptedException e) {
-            System.out.println("Interruped sending message");
-        }
-        return false;
+
+        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.discarding())
+                .thenAccept(response -> {
+                    if (response.statusCode() >= 200 && response.statusCode() < 300) {
+                        System.out.println("Message sent successfully.");
+                    } else {
+                        System.err.println("Error while sending: " + response.statusCode());
+                    }
+                })
+                .exceptionally(e -> {
+                    System.err.println("Network issue: " + e.getMessage());
+                    return null;
+                });
+
+        return true;
     }
 
     @Override

src/main/java/module-info.java

@@ -1,4 +1,4 @@
-module hellofx {
+module chatapp {
     requires javafx.controls;
     requires javafx.fxml;
     requires com.fasterxml.jackson.annotation;

src/test/java/com/example/ChatModelTest.java

@@ -3,7 +3,6 @@
 
 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 static com.github.tomakehurst.wiremock.client.WireMock.*;
@@ -24,7 +23,6 @@ class ChatModelTest {
 
 
     @Test
-    @DisplayName("När sendMessage anropas, ska rätt meddelande skickas till anslutningen")
     void sendMessage_callsConnectionWithCorrectMessage() {
 
         var spy = new NtfyConnectionSpy();
@@ -41,7 +39,7 @@ void sendMessage_callsConnectionWithCorrectMessage() {
 
 
     @Test
-    @DisplayName("När ett meddelande tas emot via anslutningen, ska det läggas till i Modelns lista")
+
     void receiveMessage_addsToObservableList() throws Exception {
 
         var spy = new NtfyConnectionSpy();
@@ -65,18 +63,16 @@ void receiveMessage_addsToObservableList() throws Exception {
     }
 
     @Test
-    @DisplayName("sendMessage ska skicka en POST-förfrågan till WireMock-servern med rätt body")
-    void sendMessageToFakeServer_viaNtfyConnectionImpl(WireMockRuntimeInfo wmRuntimeInfo) {
+    void sendMessageToFakeServer_viaNtfyConnectionImpl(WireMockRuntimeInfo wmRuntimeInfo) throws InterruptedException {
         var con = new NtfyConnectionImpl("http://localhost:" + wmRuntimeInfo.getHttpPort());
         var model = new ChatModel(con);
         String messageToSend = "Test Body Content";
 
-
         stubFor(post("/mytopic").willReturn(ok()));
 
-
         model.sendMessage(messageToSend);
 
+        Thread.sleep(500);
 
         verify(postRequestedFor(urlEqualTo("/mytopic"))
                 .withRequestBody(matching(messageToSend)));