feat(Discovery v2): Discriminator for QueryAggregation

Author: mediumTaj

src/IBM.Watson.Discovery.v2/IBM.Watson.Discovery.v2.csproj

@@ -27,6 +27,7 @@
     <ItemGroup>
         <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.1.0-rc01" />
         <PackageReference Include="IBM.Watson.Common" Version="4.0.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.6.0" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
 

src/IBM.Watson.Discovery.v2/Model/QueryAggregation.cs

@@ -15,13 +15,26 @@
 *
 */
 
+using JsonSubTypes;
 using Newtonsoft.Json;
 
 namespace IBM.Watson.Discovery.v2.Model
 {
     /// <summary>
     /// An abstract aggregation type produced by Discovery to analyze the input provided.
     /// </summary>
+    [JsonConverter(typeof(JsonSubtypes), "Type")]
+    [JsonSubtypes.KnownSubType(typeof(QueryHistogramAggregation), "histogram")]
+    [JsonSubtypes.KnownSubType(typeof(QueryCalculationAggregation), "max")]
+    [JsonSubtypes.KnownSubType(typeof(QueryCalculationAggregation), "min")]
+    [JsonSubtypes.KnownSubType(typeof(QueryCalculationAggregation), "average")]
+    [JsonSubtypes.KnownSubType(typeof(QueryCalculationAggregation), "sum")]
+    [JsonSubtypes.KnownSubType(typeof(QueryCalculationAggregation), "unique_count")]
+    [JsonSubtypes.KnownSubType(typeof(QueryTermAggregation), "term")]
+    [JsonSubtypes.KnownSubType(typeof(QueryFilterAggregation), "filter")]
+    [JsonSubtypes.KnownSubType(typeof(QueryNestedAggregation), "nested")]
+    [JsonSubtypes.KnownSubType(typeof(QueryTimesliceAggregation), "timeslice")]
+    [JsonSubtypes.KnownSubType(typeof(QueryTopHitsAggregation), "top_hits")]
     public class QueryAggregation
     {
         /// <summary>

src/IBM.Watson.Discovery.v2/Model/QueryCalculationAggregation.cs

@@ -23,7 +23,7 @@ namespace IBM.Watson.Discovery.v2.Model
     /// Returns a scalar calculation across all documents for the field specified. Possible calculations include min,
     /// max, sum, average, and unique_count.
     /// </summary>
-    public class QueryCalculationAggregation
+    public class QueryCalculationAggregation : QueryAggregation
     {
         /// <summary>
         /// The field to perform the calculation on.

src/IBM.Watson.Discovery.v2/Model/QueryFilterAggregation.cs

@@ -23,7 +23,7 @@ namespace IBM.Watson.Discovery.v2.Model
     /// <summary>
     /// A modifier that will narrow down the document set of the sub aggregations it precedes.
     /// </summary>
-    public class QueryFilterAggregation
+    public class QueryFilterAggregation : QueryAggregation
     {
         /// <summary>
         /// The filter written in Discovery Query Language syntax applied to the documents before sub aggregations are

src/IBM.Watson.Discovery.v2/Model/QueryHistogramAggregation.cs

@@ -24,7 +24,7 @@ namespace IBM.Watson.Discovery.v2.Model
     /// Numeric interval segments to categorize documents by using field values from a single numeric field to describe
     /// the category.
     /// </summary>
-    public class QueryHistogramAggregation
+    public class QueryHistogramAggregation : QueryAggregation
     {
         /// <summary>
         /// The numeric field name used to create the histogram.

src/IBM.Watson.Discovery.v2/Model/QueryNestedAggregation.cs

@@ -24,7 +24,7 @@ namespace IBM.Watson.Discovery.v2.Model
     /// A restriction that alter the document set used for sub aggregations it precedes to nested documents found in the
     /// field specified.
     /// </summary>
-    public class QueryNestedAggregation
+    public class QueryNestedAggregation : QueryAggregation
     {
         /// <summary>
         /// The path to the document field to scope sub aggregations to.

src/IBM.Watson.Discovery.v2/Model/QueryTermAggregation.cs

@@ -23,7 +23,7 @@ namespace IBM.Watson.Discovery.v2.Model
     /// <summary>
     /// Returns the top values for the field specified.
     /// </summary>
-    public class QueryTermAggregation
+    public class QueryTermAggregation : QueryAggregation
     {
         /// <summary>
         /// The field in the document used to generate top values from.

src/IBM.Watson.Discovery.v2/Model/QueryTimesliceAggregation.cs

@@ -23,7 +23,7 @@ namespace IBM.Watson.Discovery.v2.Model
     /// <summary>
     /// A specialized histogram aggregation that uses dates to create interval segments.
     /// </summary>
-    public class QueryTimesliceAggregation
+    public class QueryTimesliceAggregation : QueryAggregation
     {
         /// <summary>
         /// The date field name used to create the timeslice.

src/IBM.Watson.Discovery.v2/Model/QueryTopHitsAggregation.cs

@@ -22,7 +22,7 @@ namespace IBM.Watson.Discovery.v2.Model
     /// <summary>
     /// Returns the top documents ranked by the score of the query.
     /// </summary>
-    public class QueryTopHitsAggregation
+    public class QueryTopHitsAggregation : QueryAggregation
     {
         /// <summary>
         /// The number of documents to return.