Add support for generic response

src/main/java/io/weaviate/client/base/Serializer.java

@@ -2,6 +2,9 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import io.weaviate.client.v1.graphql.model.GraphQLTypedResponse;
+import java.lang.reflect.Type;
 
 public class Serializer {
   private Gson gson;
@@ -11,7 +14,16 @@ public Serializer() {
   }
 
   public <C> C toResponse(String response, Class<C> classOfT) {
-    return gson.fromJson(response, classOfT);
+    return gson.fromJson(response, TypeToken.get(classOfT));
+  }
+
+  public <C> GraphQLTypedResponse<C> toResponseTyped(String response, Class<C> classOfT) {
+    return gson.fromJson(response,
+      TypeToken.getParameterized(GraphQLTypedResponse.class, classOfT).getType());
+  }
+
+  public <C> C toResponse(String response, Type typeOfT) {
+    return gson.fromJson(response, typeOfT);
   }
 
   public String toJsonString(Object object) {

src/main/java/io/weaviate/client/base/TypedSerializer.java

@@ -0,0 +1,21 @@
+package io.weaviate.client.base;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import io.weaviate.client.v1.graphql.model.GraphQLTypedResponse;
+import java.lang.reflect.Type;
+
+public class TypedSerializer<T> {
+  private Class<T> givenClass;
+  private final Gson gson;
+
+  public TypedSerializer() {
+    this.gson = new GsonBuilder().disableHtmlEscaping().create();
+  }
+
+  public GraphQLTypedResponse<T> toResponseTyped(String response, Class<T> classOfT) {
+    return gson.fromJson(response,
+      TypeToken.getParameterized(GraphQLTypedResponse.class, classOfT).getType());
+  }
+}

src/main/java/io/weaviate/client/v1/graphql/model/GraphQLBaseObject.java

@@ -0,0 +1,19 @@
+package io.weaviate.client.v1.graphql.model;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.Map;
+import lombok.Getter;
+
+@Getter
+public class GraphQLBaseObject {
+  @SerializedName(value = "_additional")
+  Additional additional;
+
+  @Getter
+  public static class Additional {
+    String id;
+    Float certainty;
+    Float[] vector;
+    Map<String, Float[]> vectors;
+  }
+}

src/main/java/io/weaviate/client/v1/graphql/model/GraphQLResponse.java

@@ -12,7 +12,7 @@
 @ToString
 @EqualsAndHashCode
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class GraphQLResponse {
-  Object data;
+public class GraphQLResponse<T> {
+  T data;
   GraphQLError[] errors;
 }

src/main/java/io/weaviate/client/v1/graphql/model/GraphQLTypedResponse.java

@@ -0,0 +1,30 @@
+package io.weaviate.client.v1.graphql.model;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Builder
+@ToString
+@EqualsAndHashCode
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class GraphQLTypedResponse<T> {
+  Operation<T> data;
+  GraphQLError[] errors;
+
+  @Getter
+  @ToString
+  @EqualsAndHashCode
+  @AllArgsConstructor
+  @FieldDefaults(level = AccessLevel.PRIVATE)
+  public static class Operation<T> {
+    @SerializedName(value = "Get", alternate = {"Aggregate", "Explore"})
+    private T objects;
+  }
+}

src/test/java/io/weaviate/client/v1/graphql/model/GraphQLTypedResponseTest.java

@@ -0,0 +1,62 @@
+package io.weaviate.client.v1.graphql.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.reflect.TypeToken;
+import io.weaviate.client.base.Serializer;
+import io.weaviate.client.base.TypedSerializer;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Spliterator;
+import lombok.Getter;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+public class GraphQLTypedResponseTest extends TestCase {
+
+  @Test
+  public void testGraphQLGetResponse() throws IOException {
+    // given
+    Serializer s = new Serializer();
+    String json = new String(Files.readAllBytes(Paths.get("src/test/resources/json/graphql-response.json")));
+    // when
+//    Type responseType = new TypeToken<GraphQLTypedResponse<Soups>>() {}.getType();
+    Type responseType = TypeToken.getParameterized(GraphQLTypedResponse.class, Soups.class).getType();
+    GraphQLTypedResponse < Soups > resp = s.toResponse(json, responseType);
+    //
+    assertThat(resp).isNotNull()
+      .extracting(o -> o.getData().getObjects().getSoups())
+      .extracting(o -> o.get(0)).isNotNull()
+      .extracting(Soups.Soup::getName).isEqualTo("JustSoup");
+  }
+
+  @Test
+  public void testGraphQLGetResponseTyped() throws IOException {
+    // given
+    Serializer s = new Serializer();
+    String json = new String(Files.readAllBytes(Paths.get("src/test/resources/json/graphql-response.json")));
+    // when
+//    Type responseType = new TypeToken<GraphQLTypedResponse<Soups>>() {}.getType();
+    GraphQLTypedResponse<Soups> resp = s.toResponseTyped(json, Soups.class);
+    //
+    assertThat(resp).isNotNull()
+      .extracting(o -> o.getData().getObjects().getSoups())
+      .extracting(o -> o.get(0)).isNotNull()
+      .extracting(Soups.Soup::getName).isEqualTo("JustSoup");
+  }
+}
+
+@Getter
+class Soups {
+  @SerializedName(value = "Soup")
+  List<Soup> soups;
+
+  @Getter
+  public static class Soup extends GraphQLBaseObject {
+    String name;
+  }
+}

src/test/resources/json/graphql-response.json

@@ -0,0 +1,14 @@
+{
+  "data": {
+    "Get": {
+      "Soup": [
+        {
+          "_additional": {
+            "certainty": 0.9999998211860657
+          },
+          "name": "JustSoup"
+        }
+      ]
+    }
+  }
+}