Merge pull request #917 from watson-developer-cloud/codegen/discovery

Add support for remaining Discovery aggregations

Author: lpatino10

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/Discovery.java

@@ -336,8 +336,7 @@ public ServiceCall<Void> deleteConfiguration(DeleteConfigurationOptions deleteCo
   public ServiceCall<Configuration> getConfiguration(GetConfigurationOptions getConfigurationOptions) {
     Validator.notNull(getConfigurationOptions, "getConfigurationOptions cannot be null");
     String[] pathSegments = { "v1/environments", "configurations" };
-    String[] pathParameters = { getConfigurationOptions.environmentId(), getConfigurationOptions
-        .configurationId() };
+    String[] pathParameters = { getConfigurationOptions.environmentId(), getConfigurationOptions.configurationId() };
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query(VERSION, versionDate);
@@ -979,6 +978,9 @@ public ServiceCall<QueryEntitiesResponse> queryEntities(QueryEntitiesOptions que
     if (queryEntitiesOptions.count() != null) {
       contentJson.addProperty("count", queryEntitiesOptions.count());
     }
+    if (queryEntitiesOptions.evidenceCount() != null) {
+      contentJson.addProperty("evidence_count", queryEntitiesOptions.evidenceCount());
+    }
     builder.bodyJson(contentJson);
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(QueryEntitiesResponse.class));
   }
@@ -1087,6 +1089,9 @@ public ServiceCall<QueryRelationsResponse> queryRelations(QueryRelationsOptions
     if (queryRelationsOptions.count() != null) {
       contentJson.addProperty("count", queryRelationsOptions.count());
     }
+    if (queryRelationsOptions.evidenceCount() != null) {
+      contentJson.addProperty("evidence_count", queryRelationsOptions.evidenceCount());
+    }
     builder.bodyJson(contentJson);
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(QueryRelationsResponse.class));
   }
@@ -1257,8 +1262,8 @@ public ServiceCall<TrainingExampleList> listTrainingExamples(
       ListTrainingExamplesOptions listTrainingExamplesOptions) {
     Validator.notNull(listTrainingExamplesOptions, "listTrainingExamplesOptions cannot be null");
     String[] pathSegments = { "v1/environments", "collections", "training_data", "examples" };
-    String[] pathParameters = { listTrainingExamplesOptions.environmentId(), listTrainingExamplesOptions
-        .collectionId(), listTrainingExamplesOptions.queryId() };
+    String[] pathParameters = { listTrainingExamplesOptions.environmentId(), listTrainingExamplesOptions.collectionId(),
+        listTrainingExamplesOptions.queryId() };
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query(VERSION, versionDate);

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/model/Calculation.java

@@ -17,12 +17,24 @@
  */
 public class Calculation extends QueryAggregation {
 
+  private String field;
   private Double value;
 
+  /**
+   * Gets the field.
+   *
+   * The field where the aggregation is located in the document.
+   *
+   * @return the field
+   */
+  public String getField() {
+    return field;
+  }
+
   /**
    * Gets the value.
    *
-   * Value of the aggregation. (For 'max' and 'min' type).
+   * Value of the aggregation.
    *
    * @return the value
    */

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/model/Conversions.java

@@ -25,6 +25,7 @@ public class Conversions extends GenericModel {
   private PdfSettings pdf;
   private WordSettings word;
   private HtmlSettings html;
+  private SegmentSettings segment;
   @SerializedName("json_normalizations")
   private List<NormalizationOperation> jsonNormalizations;
 
@@ -61,6 +62,17 @@ public HtmlSettings getHtml() {
     return html;
   }
 
+  /**
+   * Gets the segment.
+   *
+   * A list of Document Segmentation settings.
+   *
+   * @return the segment
+   */
+  public SegmentSettings getSegment() {
+    return segment;
+  }
+
   /**
    * Gets the jsonNormalizations.
    *
@@ -100,6 +112,15 @@ public void setHtml(final HtmlSettings html) {
     this.html = html;
   }
 
+  /**
+   * Sets the segment.
+   *
+   * @param segment the new segment
+   */
+  public void setSegment(final SegmentSettings segment) {
+    this.segment = segment;
+  }
+
   /**
    * Sets the jsonNormalizations.
    *

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/model/Filter.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018 IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.watson.developer_cloud.discovery.v1.model;
+
+/**
+ * Filter.
+ */
+public class Filter extends QueryAggregation {
+
+  private String match;
+
+  /**
+   * Gets the match.
+   *
+   * The match the aggregated results queried for.
+   *
+   * @return the match
+   */
+  public String getMatch() {
+    return match;
+  }
+}

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/model/Histogram.java

@@ -17,8 +17,20 @@
  */
 public class Histogram extends QueryAggregation {
 
+  private String field;
   private Long interval;
 
+  /**
+   * Gets the field.
+   *
+   * The field where the aggregation is located in the document.
+   *
+   * @return the field
+   */
+  public String getField() {
+    return field;
+  }
+
   /**
    * Gets the interval.
    *

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/model/Nested.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018 IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.watson.developer_cloud.discovery.v1.model;
+
+/**
+ * Nested.
+ */
+public class Nested extends QueryAggregation {
+
+  private String path;
+
+  /**
+   * Gets the path.
+   *
+   * The area of the results the aggregation was restricted to.
+   *
+   * @return the path
+   */
+  public String getPath() {
+    return path;
+  }
+}

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/model/QueryAggregation.java

@@ -26,9 +26,7 @@
 public class QueryAggregation extends GenericModel {
 
   private String type;
-  private String field;
   private List<AggregationResult> results;
-  private String match;
   @SerializedName("matching_results")
   private Long matchingResults;
   private List<QueryAggregation> aggregations;
@@ -44,17 +42,6 @@ public String getType() {
     return type;
   }
 
-  /**
-   * Gets the field.
-   *
-   * The field where the aggregation is located in the document.
-   *
-   * @return the field
-   */
-  public String getField() {
-    return field;
-  }
-
   /**
    * Gets the results.
    *
@@ -64,17 +51,6 @@ public List<AggregationResult> getResults() {
     return results;
   }
 
-  /**
-   * Gets the match.
-   *
-   * The match the aggregated results queried for.
-   *
-   * @return the match
-   */
-  public String getMatch() {
-    return match;
-  }
-
   /**
    * Gets the matchingResults.
    *
@@ -106,15 +82,6 @@ public void setType(final String type) {
     this.type = type;
   }
 
-  /**
-   * Sets the field.
-   *
-   * @param field the new field
-   */
-  public void setField(final String field) {
-    this.field = field;
-  }
-
   /**
    * Sets the results.
    *
@@ -124,15 +91,6 @@ public void setResults(final List<AggregationResult> results) {
     this.results = results;
   }
 
-  /**
-   * Sets the match.
-   *
-   * @param match the new match
-   */
-  public void setMatch(final String match) {
-    this.match = match;
-  }
-
   /**
    * Sets the matchingResults.
    *

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/model/QueryEntitiesOptions.java

@@ -26,6 +26,7 @@ public class QueryEntitiesOptions extends GenericModel {
   private QueryEntitiesEntity entity;
   private QueryEntitiesContext context;
   private Long count;
+  private Long evidenceCount;
 
   /**
    * Builder.
@@ -37,6 +38,7 @@ public static class Builder {
     private QueryEntitiesEntity entity;
     private QueryEntitiesContext context;
     private Long count;
+    private Long evidenceCount;
 
     private Builder(QueryEntitiesOptions queryEntitiesOptions) {
       environmentId = queryEntitiesOptions.environmentId;
@@ -45,6 +47,7 @@ private Builder(QueryEntitiesOptions queryEntitiesOptions) {
       entity = queryEntitiesOptions.entity;
       context = queryEntitiesOptions.context;
       count = queryEntitiesOptions.count;
+      evidenceCount = queryEntitiesOptions.evidenceCount;
     }
 
     /**
@@ -138,6 +141,17 @@ public Builder count(long count) {
       this.count = count;
       return this;
     }
+
+    /**
+     * Set the evidenceCount.
+     *
+     * @param evidenceCount the evidenceCount
+     * @return the QueryEntitiesOptions builder
+     */
+    public Builder evidenceCount(long evidenceCount) {
+      this.evidenceCount = evidenceCount;
+      return this;
+    }
   }
 
   private QueryEntitiesOptions(Builder builder) {
@@ -149,6 +163,7 @@ private QueryEntitiesOptions(Builder builder) {
     entity = builder.entity;
     context = builder.context;
     count = builder.count;
+    evidenceCount = builder.evidenceCount;
   }
 
   /**
@@ -185,7 +200,7 @@ public String collectionId() {
   /**
    * Gets the feature.
    *
-   * The entity query feature to perform. Must be `disambiguate`.
+   * The entity query feature to perform. Supported features are `disambiguate` and `similar_entities`.
    *
    * @return the feature
    */
@@ -226,4 +241,16 @@ public QueryEntitiesContext context() {
   public Long count() {
     return count;
   }
+
+  /**
+   * Gets the evidenceCount.
+   *
+   * The number of evidence items to return for each result. The default is `0`. The maximum number of evidence items
+   * per query is 10,000.
+   *
+   * @return the evidenceCount
+   */
+  public Long evidenceCount() {
+    return evidenceCount;
+  }
 }

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/model/QueryEntitiesResponse.java

@@ -21,14 +21,14 @@
  */
 public class QueryEntitiesResponse extends GenericModel {
 
-  private List<QueryEntitiesEntity> entities;
+  private List<QueryEntitiesResponseItem> entities;
 
   /**
    * Gets the entities.
    *
    * @return the entities
    */
-  public List<QueryEntitiesEntity> getEntities() {
+  public List<QueryEntitiesResponseItem> getEntities() {
     return entities;
   }
 }