Refactor HelloModel to use NtfyConnection for message handling and add unit tests

Author: VonAdamo

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

@@ -5,12 +5,9 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 
-/**
- * Controller layer: mediates between the view (FXML) and the model.
- */
 public class HelloController {
 
-    private final HelloModel model = new HelloModel();
+    private final HelloModel model = new HelloModel(new NtfyConnectionImpl());
     public ListView<NtfyMessageDto> messageView;
 
     @FXML

src/main/java/com/example/HelloModel.java

@@ -2,6 +2,8 @@
 
 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;
@@ -18,57 +20,41 @@
  */
 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();
     }
 
     public ObservableList<NtfyMessageDto> getMessages() {
         return messages;
     }
 
+    public String getMessageToSend() {
+        return messageToSend.get();
+    }
+    public StringProperty messageToSendProperty() {
+        return messageToSend;
+    }
+
+    public void setMessageToSend(String message) {
+        messageToSend.set(message);
+    }
+
     public String getGreeting() {
         String javaVersion = System.getProperty("java.version");
         String javafxVersion = System.getProperty("javafx.version");
         return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
     }
 
     public void sendMessage() {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString("Hello World!🚀"))
-                .uri(URI.create(hostName + "/mytopic"))
-                .build();
-
-        try {
-            //TODO: handle long blockings end request to not freeze the JavaFX thread
-            //1, Use thread send message
-            //2, Use async
-            var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
-        } catch (IOException e) {
-            System.out.println("Error sending message");
-        } catch (InterruptedException e) {
-            System.out.println("Interrupted sending message");
-        }
+        connection.send(messageToSend.get());
     }
 
     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))
-                        .filter(message -> message.event().equals("message"))
-                        .peek(System.out::println)
-                        .forEach( s -> Platform.runLater(() -> messages.add(s))));
-
+        connection.receive(m -> Platform.runLater(() -> messages.add(m)));
     }
 }

src/main/java/com/example/NtfyConnection.java

@@ -0,0 +1,12 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public interface NtfyConnection {
+
+    public boolean send(String message);
+
+    public void receive(Consumer<NtfyMessageDto> messageHandler);
+
+
+}

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

@@ -0,0 +1,58 @@
+package com.example;
+
+import io.github.cdimascio.dotenv.Dotenv;
+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"));
+    }
+
+    @Override
+    public boolean send(String message) {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .POST(HttpRequest.BodyPublishers.ofString("Hello World!🚀"))
+                .header("Cache", "no")
+                .uri(URI.create(hostName + "/mytopic"))
+                .build();
+
+        try {
+            var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
+            return true;
+        } catch (IOException e) {
+            System.out.println("Error sending message");
+        } catch (InterruptedException e) {
+            System.out.println("Interrupted sending message");
+        }
+        return false;
+    }
+
+    @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));
+
+    }
+}

src/main/java/module-info.java

@@ -6,6 +6,7 @@
     requires java.sql;
     requires tools.jackson.databind;
     requires java.desktop;
+    requires javafx.graphics;
 
     opens com.example to javafx.fxml;
     exports com.example;

src/test/java/com/example/HelloModelTest.java

@@ -0,0 +1,21 @@
+package com.example;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class HelloModelTest {
+
+    @Test
+    void sendMessageCallsConnectionWithMessageToSend() {
+        // 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");
+    }
+
+}

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 boolean send(String message) {
+        this.message = message;
+        return true;
+    }
+
+    @Override
+    public void receive(Consumer<NtfyMessageDto> messageHandler) {
+
+    }
+}