add a way to get deserialized objects from the Event

Author: ryber

unirest-bdd-tests/src/test/java/BehaviorTests/SSETest.java

@@ -118,7 +118,6 @@ void headers(){
                 .assertHeader("number", "1")
                 .assertHeader("fruit", "apple")
                 .assertCookie("snack", "snickerdoodle");
-
     }
 
     @Test

unirest-bdd-tests/src/test/java/kong/unirest/core/EventSerializationTest.java

@@ -0,0 +1,63 @@
+/**
+ * The MIT License
+ *
+ * Copyright for portions of unirest-java are held by Kong Inc (c) 2013.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package kong.unirest.core;
+
+import BehaviorTests.Foo;
+import BehaviorTests.JacksonObjectMapper;
+import kong.unirest.core.java.Event;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class EventSerializationTest {
+    @Test
+    void canDeserialize() {
+        var config = new Config();
+        var om = new JacksonObjectMapper();
+        config.setObjectMapper(om);
+
+        var foo = new Foo("qux");
+        var event = new Event("", "message", om.writeValue(foo), config);
+
+        assertThat(event.asObject(Foo.class))
+                .isEqualTo(foo);
+    }
+
+    @Test
+    void canDeserializeWithGenericTypes(){
+        var config = new Config();
+        var om = new JacksonObjectMapper();
+        config.setObjectMapper(om);
+
+        var foo = List.of(new Foo("qux"));
+        var event = new Event("", "message", om.writeValue(foo), config);
+
+        assertThat(event.asObject(new GenericType<List<Foo>>() {}))
+                .isEqualTo(foo);
+    }
+}

unirest/src/main/java/kong/unirest/core/SseListener.java

@@ -27,7 +27,8 @@
 
 import kong.unirest.core.java.Event;
 
+@FunctionalInterface
 public interface SseListener {
     void onEvent(Event event);
-    void onComment(String line);
+    default void onComment(String line) {}
 }

unirest/src/main/java/kong/unirest/core/java/Event.java

@@ -25,20 +25,29 @@
 
 package kong.unirest.core.java;
 
+import kong.unirest.core.Config;
+import kong.unirest.core.GenericType;
+
 import java.util.Objects;
 
 public class Event {
+    private final Config config;
     private final String id;
-    private final Object data;
+    private final String data;
     private final String field;
 
-    public Event(String id, String field, Object data){
+    public Event(String id, String field, String data, Config config) {
+        this.config = config;
         this.id = id;
         this.field = field;
         this.data = data;
     }
 
-    public Object data() {
+    public Event(String id, String field, String data) {
+        this(id, field, data, null);
+    }
+
+    public String data() {
         return data;
     }
 
@@ -72,4 +81,12 @@ public String toString() {
                 ", id=" + id  +
                 '}';
     }
+
+    public <T> T asObject(Class<? extends T> responseClass) {
+        return config.getObjectMapper().readValue(data, responseClass);
+    }
+
+    public <T> T asObject(GenericType<T> genericType){
+        return config.getObjectMapper().readValue(data, genericType);
+    }
 }

unirest/src/main/java/kong/unirest/core/java/JavaClient.java

@@ -165,7 +165,7 @@ public CompletableFuture<Void> sse(SseRequest request, SseListener listener) {
         var r = SseRequestBuilder.getHttpRequest(request);
 
         return client.sendAsync(r, java.net.http.HttpResponse.BodyHandlers.ofLines())
-                .thenAccept(new SseResponseHandler(listener))
+                .thenAccept(new SseResponseHandler(config, listener))
                 .exceptionally(ex -> {
                     System.err.println("Error: " + ex.getMessage());
                     return null;

unirest/src/main/java/kong/unirest/core/java/SseResponseHandler.java

@@ -25,17 +25,20 @@
 
 package kong.unirest.core.java;
 
+import kong.unirest.core.Config;
 import kong.unirest.core.SseListener;
 
 import java.net.http.HttpResponse;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 class SseResponseHandler implements Consumer<HttpResponse<Stream<String>>> {
+    private final Config config;
     private final SseListener listener;
     private EventBuffer databuffer = new EventBuffer();
 
-    public SseResponseHandler(SseListener listener) {
+    public SseResponseHandler(Config config, SseListener listener) {
+        this.config = config;
         this.listener = listener;
     }
 
@@ -144,7 +147,7 @@ private class EventBuffer {
         StringBuffer buffer = new StringBuffer();
 
         public Event toEvent() {
-            return new Event(id, type, getValue());
+            return new Event(id, type, getValue(), config);
         }
 
         private String getValue() {

unirest/src/test/java/kong/unirest/core/java/SseResponseHandlerTest.java

@@ -46,7 +46,7 @@ class SseResponseHandlerTest {
     @BeforeEach
     void setUp() {
         listener = new TestListener();
-        handler = new SseResponseHandler(listener);
+        handler = new SseResponseHandler(null, listener);
     }
 
     @Test