fix(Discovery): Add GenericQueryAggregation classes

This class acts as a catch-all in cases where we can't identify the returned query aggregation. This prevents circular deserialization in the adapter.
watson-developer-cloud · Nov 21, 2019 · 11f04fb · 11f04fb
1 parent a4298bd
commit 11f04fb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/discovery/src/main/java/com/ibm/watson/discovery/v1/query/AggregationDeserializer.java b/discovery/src/main/java/com/ibm/watson/discovery/v1/query/AggregationDeserializer.java
@@ -78,7 +78,7 @@ public QueryAggregation deserialize(JsonElement json, Type typeOfT, JsonDeserial
     } else if (aggregationType.equals(AggregationType.TOP_HITS.getName())) {
       aggregation = GsonSingleton.getGson().fromJson(json, TopHits.class);
     } else {
-      aggregation = GsonSingleton.getGson().fromJson(json, QueryAggregation.class);
+      aggregation = GsonSingleton.getGson().fromJson(json, GenericQueryAggregation.class);
     }
 
     return aggregation;

diff --git a/discovery/src/main/java/com/ibm/watson/discovery/v1/query/GenericQueryAggregation.java b/discovery/src/main/java/com/ibm/watson/discovery/v1/query/GenericQueryAggregation.java
@@ -0,0 +1,9 @@
+package com.ibm.watson.discovery.v1.query;
+
+import com.ibm.watson.discovery.v1.model.QueryAggregation;
+
+/**
+ * Catch-all class for query aggregations which can't be identified and deserialized to a known class.
+ */
+public class GenericQueryAggregation extends QueryAggregation {
+}
diff --git a/discovery/src/main/java/com/ibm/watson/discovery/v2/query/AggregationDeserializer.java b/discovery/src/main/java/com/ibm/watson/discovery/v2/query/AggregationDeserializer.java
@@ -79,7 +79,7 @@ public QueryAggregation deserialize(JsonElement json, Type typeOfT, JsonDeserial
     } else if (aggregationType.equals(AggregationType.TOP_HITS.getName())) {
       aggregation = GsonSingleton.getGson().fromJson(json, QueryTopHitsAggregation.class);
     } else {
-      aggregation = GsonSingleton.getGson().fromJson(json, QueryAggregation.class);
+      aggregation = GsonSingleton.getGson().fromJson(json, GenericQueryAggregation.class);
     }
 
     return aggregation;

diff --git a/discovery/src/main/java/com/ibm/watson/discovery/v2/query/GenericQueryAggregation.java b/discovery/src/main/java/com/ibm/watson/discovery/v2/query/GenericQueryAggregation.java
@@ -0,0 +1,9 @@
+package com.ibm.watson.discovery.v2.query;
+
+import com.ibm.watson.discovery.v2.model.QueryAggregation;
+
+/**
+ * Catch-all class for query aggregations which can't be identified and deserialized to a known class.
+ */
+public class GenericQueryAggregation extends QueryAggregation {
+}