Merge pull request #828 from watson-developer-cloud/dynamic-property-fix

Add generated code using API spec as of 12/5/17

Author: lpatino10

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

@@ -162,7 +162,7 @@ public Builder file(File file) throws FileNotFoundException {
   private AddDocumentOptions(Builder builder) {
     Validator.notEmpty(builder.environmentId, "environmentId cannot be empty");
     Validator.notEmpty(builder.collectionId, "collectionId cannot be empty");
-    Validator.isTrue((builder.file == null)  || (builder.filename != null),
+    Validator.isTrue((builder.file == null) || (builder.filename != null),
         "filename cannot be null if file is not null.");
     environmentId = builder.environmentId;
     collectionId = builder.collectionId;
@@ -230,8 +230,8 @@ public String filename() {
    * Gets the metadata.
    *
    * If you're using the Data Crawler to upload your documents, you can test a document against the type of metadata
-   * that the Data Crawler might send. The maximum supported metadata file size is 1 MB. Metadata parts larger than 1
-   * MB are rejected. Example:  ``` {   "Creator": "Johnny Appleseed",   "Subject": "Apples" } ```.
+   * that the Data Crawler might send. The maximum supported metadata file size is 1 MB. Metadata parts larger than 1 MB
+   * are rejected. Example: ``` { "Creator": "Johnny Appleseed", "Subject": "Apples" } ```
    *
    * @return the metadata
    */

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

@@ -87,7 +87,7 @@ public String getDescription() {
   /**
    * Gets the created.
    *
-   * The creation date of the collection in the format yyyy-MM-dd'T'HH:mmcon:ss.SSS'Z'.
+   * The creation date of the collection in the format yyyy-MM-dd'T'HH:mmcon:ss.SSS'Z'
    *
    * @return the created
    */
@@ -98,7 +98,7 @@ public Date getCreated() {
   /**
    * Gets the updated.
    *
-   * The timestamp of when the collection was last updated in the format yyyy-MM-dd'T'HH:mm:ss.SSS'Z'.
+   * The timestamp of when the collection was last updated in the format yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
    *
    * @return the updated
    */
@@ -131,8 +131,8 @@ public String getConfigurationId() {
   /**
    * Gets the language.
    *
-   * The language of the documents stored in the collection. Permitted values include `en_us` (U.S. English),
-   * `de` (German), and `es` (Spanish).
+   * The language of the documents stored in the collection. Permitted values include `en_us` (U.S. English), `de`
+   * (German), and `es` (Spanish).
    *
    * @return the language
    */
@@ -143,8 +143,8 @@ public String getLanguage() {
   /**
    * Gets the documentCounts.
    *
-   * The object providing information about the documents in the collection. Present only when retrieving details of
-   * a collection.
+   * The object providing information about the documents in the collection. Present only when retrieving details of a
+   * collection.
    *
    * @return the documentCounts
    */
@@ -155,8 +155,8 @@ public DocumentCounts getDocumentCounts() {
   /**
    * Gets the diskUsage.
    *
-   * The object providing information about the disk usage of the collection. Present only when retrieving details of
-   * a collection.
+   * The object providing information about the disk usage of the collection. Present only when retrieving details of a
+   * collection.
    *
    * @return the diskUsage
    */

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

@@ -27,7 +27,7 @@ public class CollectionUsage extends GenericModel {
   /**
    * Gets the available.
    *
-   * Number of active collections in the environment.
+   * Number of active collections in the environment
    *
    * @return the available
    */
@@ -38,7 +38,7 @@ public Long getAvailable() {
   /**
    * Gets the maximumAllowed.
    *
-   * Total number of collections allowed in the environment.
+   * Total number of collections allowed in the environment
    *
    * @return the maximumAllowed
    */

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

@@ -36,7 +36,7 @@ public class Configuration extends GenericModel {
   /**
    * Gets the configurationId.
    *
-   * The unique identifier of the configuration.
+   * The unique identifier of the configuration
    *
    * @return the configurationId
    */
@@ -58,7 +58,7 @@ public String getName() {
   /**
    * Gets the created.
    *
-   * The creation date of the configuration in the format yyyy-MM-dd'T'HH:mm:ss.SSS'Z'.
+   * The creation date of the configuration in the format yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
    *
    * @return the created
    */
@@ -69,7 +69,7 @@ public Date getCreated() {
   /**
    * Gets the updated.
    *
-   * The timestamp of when the configuration was last updated in the format yyyy-MM-dd'T'HH:mm:ss.SSS'Z'.
+   * The timestamp of when the configuration was last updated in the format yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
    *
    * @return the updated
    */

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

@@ -0,0 +1,132 @@
+/*
+ * Copyright 2017 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;
+
+import com.google.gson.annotations.SerializedName;
+import com.ibm.watson.developer_cloud.service.model.GenericModel;
+
+/**
+ * CreateCollectionRequest.
+ */
+public class CreateCollectionRequest extends GenericModel {
+
+  /**
+   * The language of the documents stored in the collection, in the form of an ISO 639-1 language code.
+   */
+  public interface Language {
+    /** en. */
+    String EN = "en";
+    /** es. */
+    String ES = "es";
+    /** de. */
+    String DE = "de";
+    /** ar. */
+    String AR = "ar";
+    /** fr. */
+    String FR = "fr";
+    /** it. */
+    String IT = "it";
+    /** ja. */
+    String JA = "ja";
+    /** ko. */
+    String KO = "ko";
+    /** pt-br. */
+    String PT_BR = "pt-br";
+  }
+
+  private String name;
+  private String description;
+  @SerializedName("configuration_id")
+  private String configurationId;
+  private String language;
+
+  /**
+   * Gets the name.
+   *
+   * The name of the collection to be created.
+   *
+   * @return the name
+   */
+  public String getName() {
+    return name;
+  }
+
+  /**
+   * Gets the description.
+   *
+   * A description of the collection.
+   *
+   * @return the description
+   */
+  public String getDescription() {
+    return description;
+  }
+
+  /**
+   * Gets the configurationId.
+   *
+   * The ID of the configuration in which the collection is to be created.
+   *
+   * @return the configurationId
+   */
+  public String getConfigurationId() {
+    return configurationId;
+  }
+
+  /**
+   * Gets the language.
+   *
+   * The language of the documents stored in the collection, in the form of an ISO 639-1 language code.
+   *
+   * @return the language
+   */
+  public String getLanguage() {
+    return language;
+  }
+
+  /**
+   * Sets the name.
+   *
+   * @param name the new name
+   */
+  public void setName(final String name) {
+    this.name = name;
+  }
+
+  /**
+   * Sets the description.
+   *
+   * @param description the new description
+   */
+  public void setDescription(final String description) {
+    this.description = description;
+  }
+
+  /**
+   * Sets the configurationId.
+   *
+   * @param configurationId the new configurationId
+   */
+  public void setConfigurationId(final String configurationId) {
+    this.configurationId = configurationId;
+  }
+
+  /**
+   * Sets the language.
+   *
+   * @param language the new language
+   */
+  public void setLanguage(final String language) {
+    this.language = language;
+  }
+}

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

@@ -75,32 +75,32 @@ public CreateConfigurationOptions build() {
     }
 
     /**
-     * Adds an enrichment to enrichments.
+     * Adds an enrichments to enrichments.
      *
-     * @param enrichment the new enrichment
+     * @param enrichments the new enrichments
      * @return the CreateConfigurationOptions builder
      */
-    public Builder addEnrichment(Enrichment enrichment) {
-      Validator.notNull(enrichment, "enrichment cannot be null");
+    public Builder addEnrichments(Enrichment enrichments) {
+      Validator.notNull(enrichments, "enrichments cannot be null");
       if (this.enrichments == null) {
         this.enrichments = new ArrayList<Enrichment>();
       }
-      this.enrichments.add(enrichment);
+      this.enrichments.add(enrichments);
       return this;
     }
 
     /**
-     * Adds an normalization to normalizations.
+     * Adds an normalizations to normalizations.
      *
-     * @param normalization the new normalization
+     * @param normalizations the new normalizations
      * @return the CreateConfigurationOptions builder
      */
-    public Builder addNormalization(NormalizationOperation normalization) {
-      Validator.notNull(normalization, "normalization cannot be null");
+    public Builder addNormalizations(NormalizationOperation normalizations) {
+      Validator.notNull(normalizations, "normalizations cannot be null");
       if (this.normalizations == null) {
         this.normalizations = new ArrayList<NormalizationOperation>();
       }
-      this.normalizations.add(normalization);
+      this.normalizations.add(normalizations);
       return this;
     }
 

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

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2017 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;
+
+import com.ibm.watson.developer_cloud.service.model.GenericModel;
+
+/**
+ * CreateEnvironmentRequest.
+ */
+public class CreateEnvironmentRequest extends GenericModel {
+
+  private String name;
+  private String description;
+  private Long size;
+
+  /**
+   * Gets the name.
+   *
+   * Name that identifies the environment.
+   *
+   * @return the name
+   */
+  public String getName() {
+    return name;
+  }
+
+  /**
+   * Gets the description.
+   *
+   * Description of the environment.
+   *
+   * @return the description
+   */
+  public String getDescription() {
+    return description;
+  }
+
+  /**
+   * Gets the size.
+   *
+   * **Deprecated**: Size of the environment.
+   *
+   * @return the size
+   */
+  public Long getSize() {
+    return size;
+  }
+
+  /**
+   * Sets the name.
+   *
+   * @param name the new name
+   */
+  public void setName(final String name) {
+    this.name = name;
+  }
+
+  /**
+   * Sets the description.
+   *
+   * @param description the new description
+   */
+  public void setDescription(final String description) {
+    this.description = description;
+  }
+
+  /**
+   * Sets the size.
+   *
+   * @param size the new size
+   */
+  public void setSize(final long size) {
+    this.size = size;
+  }
+}