Merge pull request #1030 from watson-developer-cloud/release-6.12.0

Release 6.12.0

Author: lpatino10

.bumpversion.cfg

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

.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+- repo: [email protected]:Whitewater/whitewater-detect-secrets
+  rev: master
+  hooks:
+    -   id: detect-secrets # pragma: whitelist secret
+        args: [--baseline, .secrets.baseline, --no-keyword-scan ]

.secrets.baseline

@@ -0,0 +1,25 @@
+{
+  "exclude_regex": null,
+  "generated_at": "2019-01-16T16:41:59Z",
+  "plugins_used": [
+    {
+      "base64_limit": 4.5,
+      "name": "Base64HighEntropyString"
+    },
+    {
+      "name": "BasicAuthDetector"
+    },
+    {
+      "hex_limit": 3,
+      "name": "HexHighEntropyString"
+    },
+    {
+      "name": "PrivateKeyDetector"
+    },
+    {
+      "name": "SlackDetector"
+    }
+  ],
+  "results": {},
+  "version": "0.10.3"
+}

README.md

@@ -61,7 +61,7 @@ All the services:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>java-sdk</artifactId>
-	<version>6.11.3</version>
+	<version>6.12.0</version>
 </dependency>
 ```
 
@@ -71,7 +71,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>discovery</artifactId>
-	<version>6.11.3</version>
+	<version>6.12.0</version>
 </dependency>
 ```
 
@@ -80,13 +80,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-sdk:6.11.3'
+'com.ibm.watson.developer_cloud:java-sdk:6.12.0'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.11.3'
+'com.ibm.watson.developer_cloud:assistant:6.12.0'
 ```
 
 ##### Development snapshots
@@ -109,7 +109,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.11.4-SNAPSHOT'
+'com.ibm.watson.developer_cloud:speech-to-text:6.12.1-SNAPSHOT'
 ```
 
 ##### JAR
@@ -348,7 +348,7 @@ Gradle:
 
 ```sh
 cd java-sdk
-gradle jar  # build jar file (build/libs/watson-developer-cloud-6.11.3.jar)
+gradle jar  # build jar file (build/libs/watson-developer-cloud-6.12.0.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)
@@ -401,4 +401,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.11.3/java-sdk-6.11.3-jar-with-dependencies.jar
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.12.0/java-sdk-6.12.0-jar-with-dependencies.jar

assistant/README.md

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

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v2/model/DialogNodeOutputOptionsElementValue.java

@@ -24,7 +24,7 @@ public class DialogNodeOutputOptionsElementValue extends GenericModel {
   /**
    * Gets the input.
    *
-   * The user input.
+   * An input object that includes the input text.
    *
    * @return the input
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v2/model/DialogSuggestionValue.java

@@ -25,7 +25,7 @@ public class DialogSuggestionValue extends GenericModel {
   /**
    * Gets the input.
    *
-   * The user input.
+   * An input object that includes the input text.
    *
    * @return the input
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v2/model/MessageContextGlobal.java

@@ -24,7 +24,7 @@ public class MessageContextGlobal extends GenericModel {
   /**
    * Gets the system.
    *
-   * Properties interpreted by the Assistant that are shared across all skills within the Assistant.
+   * Properties that are shared by all skills used by the assistant.
    *
    * @return the system
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v2/model/MessageContextGlobalSystem.java

@@ -41,8 +41,9 @@ public String getTimezone() {
    * Gets the userId.
    *
    * A string value that identifies the user who is interacting with the assistant. The client must provide a unique
-   * identifier for each individual end user who accesses the application. This user ID may be used for billing and
-   * other purposes.
+   * identifier for each individual end user who accesses the application. For Plus and Premium plans, this user ID is
+   * used to identify unique users for billing purposes. This string cannot contain carriage return, newline, or tab
+   * characters.
    *
    * @return the userId
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v2/model/MessageContextSkill.java

@@ -0,0 +1,36 @@
+/*
+ * 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.assistant.v2.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.ibm.watson.developer_cloud.service.model.GenericModel;
+
+/**
+ * Contains information specific to a particular skill within the Assistant.
+ */
+public class MessageContextSkill extends GenericModel {
+
+  @SerializedName("user_defined")
+  private String userDefined;
+
+  /**
+   * Gets the userDefined.
+   *
+   * Arbitrary variables that can be read and written to by a particular skill within the Assistant.
+   *
+   * @return the userDefined
+   */
+  public String getUserDefined() {
+    return userDefined;
+  }
+}