Merge pull request #1009 from watson-developer-cloud/stt-patch

Patch changes for  Discovery and Speech to Text

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.9.2
+current_version = 6.9.3
 commit = True
 message = docs: Update version numbers from {current_version} -> {new_version}
 

README.md

@@ -60,7 +60,7 @@ All the services:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>java-sdk</artifactId>
-	<version>6.9.2</version>
+	<version>6.9.3</version>
 </dependency>
 ```
 
@@ -70,7 +70,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>discovery</artifactId>
-	<version>6.9.2</version>
+	<version>6.9.3</version>
 </dependency>
 ```
 
@@ -79,13 +79,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-sdk:6.9.2'
+'com.ibm.watson.developer_cloud:java-sdk:6.9.3'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.9.2'
+'com.ibm.watson.developer_cloud:assistant:6.9.3'
 ```
 
 ##### Development snapshots
@@ -108,7 +108,7 @@ And then reference the snapshot version on your app module gradle
 Only Speech to Text:
 
 ```gradle
-'com.ibm.watson.developer_cloud:speech-to-text:6.9.3-SNAPSHOT'
+'com.ibm.watson.developer_cloud:speech-to-text:6.9.4-SNAPSHOT'
 ```
 
 ##### JAR
@@ -347,7 +347,7 @@ Gradle:
 
 ```sh
 cd java-sdk
-gradle jar  # build jar file (build/libs/watson-developer-cloud-6.9.2.jar)
+gradle jar  # build jar file (build/libs/watson-developer-cloud-6.9.3.jar)
 gradle test # run tests
 gradle check # performs quality checks on source files and generates reports
 gradle testReport # run tests and generate the aggregated test report (build/reports/allTests)
@@ -400,4 +400,4 @@ or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-watson).
 [ibm-cloud-onboarding]: http://console.bluemix.net/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Java
 
 
-[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.9.2/java-sdk-6.9.2-jar-with-dependencies.jar
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.9.3/java-sdk-6.9.3-jar-with-dependencies.jar

assistant/README.md

@@ -10,13 +10,13 @@ This service is currently in **private beta** and requires access to use. To lea
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>assistant</artifactId>
-  <version>6.9.2</version>
+  <version>6.9.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.9.2'
+'com.ibm.watson.developer_cloud:assistant:6.9.3'
 ```
 
 ## Usage

conversation/README.md

@@ -10,13 +10,13 @@ Conversation will be removed in the next major release. Please migrate to Assist
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>conversation</artifactId>
-  <version>6.9.2</version>
+  <version>6.9.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:conversation:6.9.2'
+'com.ibm.watson.developer_cloud:conversation:6.9.3'
 ```
 
 ## Usage

discovery/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>discovery</artifactId>
-  <version>6.9.2</version>
+  <version>6.9.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:discovery:6.9.2'
+'com.ibm.watson.developer_cloud:discovery:6.9.3'
 ```
 
 ## Usage

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

@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+import com.ibm.watson.developer_cloud.service.model.GenericModel;
+
+/**
+ * An object specifiying the concepts enrichment and related parameters.
+ */
+public class NluEnrichmentConcepts extends GenericModel {
+
+  private Long limit;
+
+  /**
+   * Gets the limit.
+   *
+   * The maximum number of concepts enrichments to extact from each instance of the specified field.
+   *
+   * @return the limit
+   */
+  public Long getLimit() {
+    return limit;
+  }
+
+  /**
+   * Sets the limit.
+   *
+   * @param limit the new limit
+   */
+  public void setLimit(final long limit) {
+    this.limit = limit;
+  }
+}

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

@@ -26,8 +26,8 @@ public class NluEnrichmentEntities extends GenericModel {
   private Boolean mentions;
   @SerializedName("mention_types")
   private Boolean mentionTypes;
-  @SerializedName("sentence_location")
-  private Boolean sentenceLocation;
+  @SerializedName("sentence_locations")
+  private Boolean sentenceLocations;
   private String model;
 
   /**
@@ -39,7 +39,7 @@ public static class Builder {
     private Long limit;
     private Boolean mentions;
     private Boolean mentionTypes;
-    private Boolean sentenceLocation;
+    private Boolean sentenceLocations;
     private String model;
 
     private Builder(NluEnrichmentEntities nluEnrichmentEntities) {
@@ -48,7 +48,7 @@ private Builder(NluEnrichmentEntities nluEnrichmentEntities) {
       limit = nluEnrichmentEntities.limit;
       mentions = nluEnrichmentEntities.mentions;
       mentionTypes = nluEnrichmentEntities.mentionTypes;
-      sentenceLocation = nluEnrichmentEntities.sentenceLocation;
+      sentenceLocations = nluEnrichmentEntities.sentenceLocations;
       model = nluEnrichmentEntities.model;
     }
 
@@ -123,13 +123,13 @@ public Builder mentionTypes(Boolean mentionTypes) {
     }
 
     /**
-     * Set the sentenceLocation.
+     * Set the sentenceLocations.
      *
-     * @param sentenceLocation the sentenceLocation
+     * @param sentenceLocations the sentenceLocations
      * @return the NluEnrichmentEntities builder
      */
-    public Builder sentenceLocation(Boolean sentenceLocation) {
-      this.sentenceLocation = sentenceLocation;
+    public Builder sentenceLocations(Boolean sentenceLocations) {
+      this.sentenceLocations = sentenceLocations;
       return this;
     }
 
@@ -151,7 +151,7 @@ private NluEnrichmentEntities(Builder builder) {
     limit = builder.limit;
     mentions = builder.mentions;
     mentionTypes = builder.mentionTypes;
-    sentenceLocation = builder.sentenceLocation;
+    sentenceLocations = builder.sentenceLocations;
     model = builder.model;
   }
 
@@ -220,15 +220,15 @@ public Boolean mentionTypes() {
   }
 
   /**
-   * Gets the sentenceLocation.
+   * Gets the sentenceLocations.
    *
    * When `true`, a list of sentence locations for each instance of each identified entity is recorded. The default is
    * `false`.
    *
-   * @return the sentenceLocation
+   * @return the sentenceLocations
    */
-  public Boolean sentenceLocation() {
-    return sentenceLocation;
+  public Boolean sentenceLocations() {
+    return sentenceLocations;
   }
 
   /**

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

@@ -28,6 +28,7 @@ public class NluEnrichmentFeatures extends GenericModel {
   @SerializedName("semantic_roles")
   private NluEnrichmentSemanticRoles semanticRoles;
   private NluEnrichmentRelations relations;
+  private NluEnrichmentConcepts concepts;
 
   /**
    * Builder.
@@ -40,6 +41,7 @@ public static class Builder {
     private NluEnrichmentCategories categories;
     private NluEnrichmentSemanticRoles semanticRoles;
     private NluEnrichmentRelations relations;
+    private NluEnrichmentConcepts concepts;
 
     private Builder(NluEnrichmentFeatures nluEnrichmentFeatures) {
       keywords = nluEnrichmentFeatures.keywords;
@@ -49,6 +51,7 @@ private Builder(NluEnrichmentFeatures nluEnrichmentFeatures) {
       categories = nluEnrichmentFeatures.categories;
       semanticRoles = nluEnrichmentFeatures.semanticRoles;
       relations = nluEnrichmentFeatures.relations;
+      concepts = nluEnrichmentFeatures.concepts;
     }
 
     /**
@@ -142,6 +145,17 @@ public Builder relations(NluEnrichmentRelations relations) {
       this.relations = relations;
       return this;
     }
+
+    /**
+     * Set the concepts.
+     *
+     * @param concepts the concepts
+     * @return the NluEnrichmentFeatures builder
+     */
+    public Builder concepts(NluEnrichmentConcepts concepts) {
+      this.concepts = concepts;
+      return this;
+    }
   }
 
   private NluEnrichmentFeatures(Builder builder) {
@@ -152,6 +166,7 @@ private NluEnrichmentFeatures(Builder builder) {
     categories = builder.categories;
     semanticRoles = builder.semanticRoles;
     relations = builder.relations;
+    concepts = builder.concepts;
   }
 
   /**
@@ -239,4 +254,15 @@ public NluEnrichmentSemanticRoles semanticRoles() {
   public NluEnrichmentRelations relations() {
     return relations;
   }
+
+  /**
+   * Gets the concepts.
+   *
+   * An object specifiying the concepts enrichment and related parameters.
+   *
+   * @return the concepts
+   */
+  public NluEnrichmentConcepts concepts() {
+    return concepts;
+  }
 }

language-translator/README.md

@@ -10,13 +10,13 @@ Language Translator v3 is now available. The v2 Language Translator API will no
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>language-translator</artifactId>
-  <version>6.9.2</version>
+  <version>6.9.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:language-translator:6.9.2'
+'com.ibm.watson.developer_cloud:language-translator:6.9.3'
 ```
 
 ## Usage

natural-language-classifier/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>natural-language-classifier</artifactId>
-  <version>6.9.2</version>
+  <version>6.9.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:natural-language-classifier:6.9.2'
+'com.ibm.watson.developer_cloud:natural-language-classifier:6.9.3'
 ```
 
 ## Usage

natural-language-understanding/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>natural-language-understanding</artifactId>
-  <version>6.9.2</version>
+  <version>6.9.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:natural-language-understanding:6.9.2'
+'com.ibm.watson.developer_cloud:natural-language-understanding:6.9.3'
 ```
 
 ## Usage

personality-insights/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>personality-insights</artifactId>
-  <version>6.9.2</version>
+  <version>6.9.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:personality-insights:6.9.2'
+'com.ibm.watson.developer_cloud:personality-insights:6.9.3'
 ```
 
 ## Usage

speech-to-text/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>speech-to-text</artifactId>
-  <version>6.9.2</version>
+  <version>6.9.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:speech-to-text:6.9.2'
+'com.ibm.watson.developer_cloud:speech-to-text:6.9.3'
 ```
 
 ## Usage