feat(Discovery): Add generated code from newest version of service

Author: lpatino10

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

@@ -29,8 +29,8 @@ public class AddDocumentOptions extends GenericModel {
   private String collectionId;
   private InputStream file;
   private String filename;
-  private String metadata;
   private String fileContentType;
+  private String metadata;
 
   /**
    * Builder.
@@ -40,16 +40,16 @@ public static class Builder {
     private String collectionId;
     private InputStream file;
     private String filename;
-    private String metadata;
     private String fileContentType;
+    private String metadata;
 
     private Builder(AddDocumentOptions addDocumentOptions) {
-      environmentId = addDocumentOptions.environmentId;
-      collectionId = addDocumentOptions.collectionId;
-      file = addDocumentOptions.file;
-      filename = addDocumentOptions.filename;
-      metadata = addDocumentOptions.metadata;
-      fileContentType = addDocumentOptions.fileContentType;
+      this.environmentId = addDocumentOptions.environmentId;
+      this.collectionId = addDocumentOptions.collectionId;
+      this.file = addDocumentOptions.file;
+      this.filename = addDocumentOptions.filename;
+      this.fileContentType = addDocumentOptions.fileContentType;
+      this.metadata = addDocumentOptions.metadata;
     }
 
     /**
@@ -123,24 +123,24 @@ public Builder filename(String filename) {
     }
 
     /**
-     * Set the metadata.
+     * Set the fileContentType.
      *
-     * @param metadata the metadata
+     * @param fileContentType the fileContentType
      * @return the AddDocumentOptions builder
      */
-    public Builder metadata(String metadata) {
-      this.metadata = metadata;
+    public Builder fileContentType(String fileContentType) {
+      this.fileContentType = fileContentType;
       return this;
     }
 
     /**
-     * Set the fileContentType.
+     * Set the metadata.
      *
-     * @param fileContentType the fileContentType
+     * @param metadata the metadata
      * @return the AddDocumentOptions builder
      */
-    public Builder fileContentType(String fileContentType) {
-      this.fileContentType = fileContentType;
+    public Builder metadata(String metadata) {
+      this.metadata = metadata;
       return this;
     }
 
@@ -168,8 +168,8 @@ private AddDocumentOptions(Builder builder) {
     collectionId = builder.collectionId;
     file = builder.file;
     filename = builder.filename;
-    metadata = builder.metadata;
     fileContentType = builder.fileContentType;
+    metadata = builder.metadata;
   }
 
   /**
@@ -206,8 +206,9 @@ public String collectionId() {
   /**
    * Gets the file.
    *
-   * The content of the document to ingest. The maximum supported file size is 50 megabytes. Files larger than 50
-   * megabytes is rejected.
+   * The content of the document to ingest. The maximum supported file size when adding a file to a collection is 50
+   * megabytes, the maximum supported file size when testing a confiruration is 1 megabyte. Files larger than the
+   * supported size are rejected.
    *
    * @return the file
    */
@@ -226,6 +227,17 @@ public String filename() {
     return filename;
   }
 
+  /**
+   * Gets the fileContentType.
+   *
+   * The content type of file. Values for this parameter can be obtained from the HttpMediaType class.
+   *
+   * @return the fileContentType
+   */
+  public String fileContentType() {
+    return fileContentType;
+  }
+
   /**
    * Gets the metadata.
    *
@@ -242,15 +254,4 @@ public String filename() {
   public String metadata() {
     return metadata;
   }
-
-  /**
-   * Gets the fileContentType.
-   *
-   * The content type of file. Values for this parameter can be obtained from the HttpMediaType class.
-   *
-   * @return the fileContentType
-   */
-  public String fileContentType() {
-    return fileContentType;
-  }
 }

discovery/src/main/java/com/ibm/watson/discovery/v1/model/AddDocumentOptions.java

@@ -40,11 +40,11 @@ public static class Builder {
     private List<TrainingExample> examples;
 
     private Builder(AddTrainingDataOptions addTrainingDataOptions) {
-      environmentId = addTrainingDataOptions.environmentId;
-      collectionId = addTrainingDataOptions.collectionId;
-      naturalLanguageQuery = addTrainingDataOptions.naturalLanguageQuery;
-      filter = addTrainingDataOptions.filter;
-      examples = addTrainingDataOptions.examples;
+      this.environmentId = addTrainingDataOptions.environmentId;
+      this.collectionId = addTrainingDataOptions.collectionId;
+      this.naturalLanguageQuery = addTrainingDataOptions.naturalLanguageQuery;
+      this.filter = addTrainingDataOptions.filter;
+      this.examples = addTrainingDataOptions.examples;
     }
 
     /**
@@ -189,6 +189,8 @@ public String collectionId() {
   /**
    * Gets the naturalLanguageQuery.
    *
+   * The natural text query for the new training query.
+   *
    * @return the naturalLanguageQuery
    */
   public String naturalLanguageQuery() {
@@ -198,6 +200,8 @@ public String naturalLanguageQuery() {
   /**
    * Gets the filter.
    *
+   * The filter used on the collection before the **natural_language_query** is applied.
+   *
    * @return the filter
    */
   public String filter() {
@@ -207,6 +211,8 @@ public String filter() {
   /**
    * Gets the examples.
    *
+   * Array of training examples.
+   *
    * @return the examples
    */
   public List<TrainingExample> examples() {

discovery/src/main/java/com/ibm/watson/discovery/v1/model/AddTrainingDataOptions.java

@@ -145,9 +145,6 @@ public String getLanguage() {
   /**
    * Gets the documentCounts.
    *
-   * The object providing information about the documents in the collection. Present only when retrieving details of a
-   * collection.
-   *
    * @return the documentCounts
    */
   public DocumentCounts getDocumentCounts() {
@@ -168,8 +165,6 @@ public CollectionDiskUsage getDiskUsage() {
   /**
    * Gets the trainingStatus.
    *
-   * Provides information about the status of relevance training for collection.
-   *
    * @return the trainingStatus
    */
   public TrainingStatus getTrainingStatus() {

discovery/src/main/java/com/ibm/watson/discovery/v1/model/Collection.java

@@ -44,6 +44,8 @@ public interface Language {
     String PT = "pt";
     /** nl. */
     String NL = "nl";
+    /** zh-CN. */
+    String ZH_CN = "zh-CN";
   }
 
   private String environmentId;
@@ -63,11 +65,11 @@ public static class Builder {
     private String language;
 
     private Builder(CreateCollectionOptions createCollectionOptions) {
-      environmentId = createCollectionOptions.environmentId;
-      name = createCollectionOptions.name;
-      description = createCollectionOptions.description;
-      configurationId = createCollectionOptions.configurationId;
-      language = createCollectionOptions.language;
+      this.environmentId = createCollectionOptions.environmentId;
+      this.name = createCollectionOptions.name;
+      this.description = createCollectionOptions.description;
+      this.configurationId = createCollectionOptions.configurationId;
+      this.language = createCollectionOptions.language;
     }
 
     /**

discovery/src/main/java/com/ibm/watson/discovery/v1/model/CreateCollectionOptions.java

@@ -44,13 +44,13 @@ public static class Builder {
     private Source source;
 
     private Builder(CreateConfigurationOptions createConfigurationOptions) {
-      environmentId = createConfigurationOptions.environmentId;
-      name = createConfigurationOptions.name;
-      description = createConfigurationOptions.description;
-      conversions = createConfigurationOptions.conversions;
-      enrichments = createConfigurationOptions.enrichments;
-      normalizations = createConfigurationOptions.normalizations;
-      source = createConfigurationOptions.source;
+      this.environmentId = createConfigurationOptions.environmentId;
+      this.name = createConfigurationOptions.name;
+      this.description = createConfigurationOptions.description;
+      this.conversions = createConfigurationOptions.conversions;
+      this.enrichments = createConfigurationOptions.enrichments;
+      this.normalizations = createConfigurationOptions.normalizations;
+      this.source = createConfigurationOptions.source;
     }
 
     /**
@@ -63,9 +63,11 @@ public Builder() {
      * Instantiates a new builder with required properties.
      *
      * @param environmentId the environmentId
+     * @param name the name
      */
-    public Builder(String environmentId) {
+    public Builder(String environmentId, String name) {
       this.environmentId = environmentId;
+      this.name = name;
     }
 
     /**
@@ -78,32 +80,32 @@ public CreateConfigurationOptions build() {
     }
 
     /**
-     * Adds an enrichments to enrichments.
+     * Adds an enrichment to enrichments.
      *
-     * @param enrichments the new enrichments
+     * @param enrichment the new enrichment
      * @return the CreateConfigurationOptions builder
      */
-    public Builder addEnrichments(Enrichment enrichments) {
-      Validator.notNull(enrichments, "enrichments cannot be null");
+    public Builder addEnrichment(Enrichment enrichment) {
+      Validator.notNull(enrichment, "enrichment cannot be null");
       if (this.enrichments == null) {
         this.enrichments = new ArrayList<Enrichment>();
       }
-      this.enrichments.add(enrichments);
+      this.enrichments.add(enrichment);
       return this;
     }
 
     /**
-     * Adds an normalizations to normalizations.
+     * Adds an normalization to normalizations.
      *
-     * @param normalizations the new normalizations
+     * @param normalization the new normalization
      * @return the CreateConfigurationOptions builder
      */
-    public Builder addNormalizations(NormalizationOperation normalizations) {
-      Validator.notNull(normalizations, "normalizations cannot be null");
+    public Builder addNormalization(NormalizationOperation normalization) {
+      Validator.notNull(normalization, "normalization cannot be null");
       if (this.normalizations == null) {
         this.normalizations = new ArrayList<NormalizationOperation>();
       }
-      this.normalizations.add(normalizations);
+      this.normalizations.add(normalization);
       return this;
     }
 
@@ -205,6 +207,7 @@ public Builder configuration(Configuration configuration) {
 
   private CreateConfigurationOptions(Builder builder) {
     Validator.notEmpty(builder.environmentId, "environmentId cannot be empty");
+    Validator.notNull(builder.name, "name cannot be null");
     environmentId = builder.environmentId;
     name = builder.name;
     description = builder.description;

discovery/src/main/java/com/ibm/watson/discovery/v1/model/CreateConfigurationOptions.java

@@ -26,6 +26,7 @@ public class CreateCredentialsOptions extends GenericModel {
    * - `salesforce` indicates the credentials are used to connect to Salesforce.
    * - `sharepoint` indicates the credentials are used to connect to Microsoft SharePoint Online.
    * - `web_crawl` indicates the credentials are used to perform a web crawl.
+   * = `cloud_object_storage` indicates the credentials are used to connect to an IBM Cloud Object Store.
    */
   public interface SourceType {
     /** box. */
@@ -36,6 +37,8 @@ public interface SourceType {
     String SHAREPOINT = "sharepoint";
     /** web_crawl. */
     String WEB_CRAWL = "web_crawl";
+    /** cloud_object_storage. */
+    String CLOUD_OBJECT_STORAGE = "cloud_object_storage";
   }
 
   private String environmentId;
@@ -51,9 +54,9 @@ public static class Builder {
     private CredentialDetails credentialDetails;
 
     private Builder(CreateCredentialsOptions createCredentialsOptions) {
-      environmentId = createCredentialsOptions.environmentId;
-      sourceType = createCredentialsOptions.sourceType;
-      credentialDetails = createCredentialsOptions.credentialDetails;
+      this.environmentId = createCredentialsOptions.environmentId;
+      this.sourceType = createCredentialsOptions.sourceType;
+      this.credentialDetails = createCredentialsOptions.credentialDetails;
     }
 
     /**
@@ -161,6 +164,7 @@ public String environmentId() {
    * - `salesforce` indicates the credentials are used to connect to Salesforce.
    * - `sharepoint` indicates the credentials are used to connect to Microsoft SharePoint Online.
    * - `web_crawl` indicates the credentials are used to perform a web crawl.
+   * = `cloud_object_storage` indicates the credentials are used to connect to an IBM Cloud Object Store.
    *
    * @return the sourceType
    */

discovery/src/main/java/com/ibm/watson/discovery/v1/model/CreateCredentialsOptions.java

@@ -60,9 +60,9 @@ public static class Builder {
     private String size;
 
     private Builder(CreateEnvironmentOptions createEnvironmentOptions) {
-      name = createEnvironmentOptions.name;
-      description = createEnvironmentOptions.description;
-      size = createEnvironmentOptions.size;
+      this.name = createEnvironmentOptions.name;
+      this.description = createEnvironmentOptions.description;
+      this.size = createEnvironmentOptions.size;
     }
 
     /**
@@ -121,13 +121,6 @@ public Builder size(String size) {
       this.size = size;
       return this;
     }
-
-    /**
-     * @deprecated This method no longer has an effect on the created environment. Please use the String method.
-     */
-    public Builder size(Long size) {
-      return this;
-    }
   }
 
   private CreateEnvironmentOptions(Builder builder) {

discovery/src/main/java/com/ibm/watson/discovery/v1/model/CreateEnvironmentOptions.java

@@ -39,8 +39,8 @@ public static class Builder {
     private EventData data;
 
     private Builder(CreateEventOptions createEventOptions) {
-      type = createEventOptions.type;
-      data = createEventOptions.data;
+      this.type = createEventOptions.type;
+      this.data = createEventOptions.data;
     }
 
     /**