Merge pull request #993 from watson-developer-cloud/codegen-updates

Release v6.8.0

Author: lpatino10

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.7.0
+current_version = 6.8.0
 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.7.0</version>
+	<version>6.8.0</version>
 </dependency>
 ```
 
@@ -70,7 +70,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>discovery</artifactId>
-	<version>6.7.0</version>
+	<version>6.8.0</version>
 </dependency>
 ```
 
@@ -79,13 +79,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-sdk:6.7.0'
+'com.ibm.watson.developer_cloud:java-sdk:6.8.0'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.7.0'
+'com.ibm.watson.developer_cloud:assistant:6.8.0'
 ```
 
 ##### 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.7.1-SNAPSHOT'
+'com.ibm.watson.developer_cloud:speech-to-text:6.8.1-SNAPSHOT'
 ```
 
 ##### JAR
@@ -136,7 +136,6 @@ Watson services are migrating to token-based Identity and Access Management (IAM
 
 - With some service instances, you authenticate to the API by using **[IAM](#iam)**.
 - In other instances, you authenticate by providing the **[username and password](#username-and-password)** for the service instance.
-- Visual Recognition uses a form of [API key](#api-key) only with instances created before May 23, 2018. Newer instances of Visual Recognition use [IAM](#iam).
 
 **Note:** Previously, it was possible to authenticate using a token in a header called `X-Watson-Authorization-Token`. This method is deprecated. The token continues to work with Cloud Foundry services, but is not supported for services that use Identity and Access Management (IAM) authentication. See [here](#iam) for details.
 
@@ -145,7 +144,7 @@ To find out which authentication to use, view the service credentials. You find
 
 1.  Go to the IBM Cloud [Dashboard](https://console.bluemix.net/dashboard/apps?category=ai) page.
 1.  Either click an existing Watson service instance or click [**Create resource > AI**](https://console.bluemix.net/catalog/?category=ai) and create a service instance.
-1.  Copy the `url` and either `apikey` or `username` and `password`. Click **Show** if the credentials are masked.
+1.  Copy the credentials you need for authentication. Click **Show** if the credentials are masked.
 
 In your code, you can use these values in the service constructor or with a method call after instantiating your service.
 
@@ -209,21 +208,6 @@ Discovery service = new Discovery("2017-11-07");
 service.setUsernameAndPassword("<username>", "<password>");
 ```
 
-### API key
-
-**Important**: This type of authentication works only with Visual Recognition instances created before May 23, 2018. Newer instances of Visual Recognition use [IAM](#iam).
-
-```java
-// in the constructor
-VisualRecognition service = new VisualRecognition("2016-05-20", "<api_key>");
-```
-
-```java
-// after instantiation
-VisualRecognition service = new VisualRecognition("2016-05-20");
-service.setApiKey("<api_key>");
-```
-
 ## Android
 
 The Android SDK utilizes the Java SDK while making some Android-specific additions. This repository can be found [here](https://github.com/watson-developer-cloud/android-sdk). It depends on [OkHttp][] and [gson][].
@@ -324,9 +308,6 @@ service.sentEndPoint("https://gateway-fra.watsonplatform.net/discovery/api")
 Make sure you are using the service credentials and not your IBM Cloud account/password.
 Check the API endpoint, you may need to update the default using `setEndPoint()`.
 
-## Changes for v4.0
-Version 4.0 focuses on the move to programmatically-generated code for many of the services. See the [changelog](https://github.com/watson-developer-cloud/java-sdk/wiki/Changelog) for the details. This version also includes many breaking changes as a result of standardizing behavior across the new generated services. Full details on migration from previous versions can be found [here](https://github.com/watson-developer-cloud/java-sdk/wiki/Migration).
-
 ## Debug
 
 HTTP requests can be logged by adding a `logging.properties` file to your classpath.
@@ -366,7 +347,7 @@ Gradle:
 
 ```sh
 cd java-sdk
-gradle jar  # build jar file (build/libs/watson-developer-cloud-6.7.0.jar)
+gradle jar  # build jar file (build/libs/watson-developer-cloud-6.8.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)
@@ -419,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.7.0/java-sdk-6.7.0-jar-with-dependencies.jar
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.8.0/java-sdk-6.8.0-jar-with-dependencies.jar

assistant/README.md

@@ -10,13 +10,13 @@ Check it out in the `assistant/v2` folder.
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>assistant</artifactId>
-  <version>6.7.0</version>
+  <version>6.8.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.7.0'
+'com.ibm.watson.developer_cloud:assistant:6.8.0'
 ```
 
 ## Usage

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

@@ -40,8 +40,9 @@ public String getTimezone() {
   /**
    * Gets the userId.
    *
-   * String value provided by the API client that should be unique per each distinct end user of the service powered by
-   * Assistant.
+   * 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.
    *
    * @return the userId
    */
@@ -52,10 +53,8 @@ public String getUserId() {
   /**
    * Gets the turnCount.
    *
-   * This property is normally set by the Assistant which sets this to 1 during the first conversation turn and then
-   * increments it by 1 with every subsequent turn. A turn count equal to 0 (or > 0) informs the Assistant that this is
-   * (or is not) the first turn in a conversation which influences the behavior of some skills. The Conversation skill
-   * uses this to evaluate its `welcome` and `conversation_start` conditions.
+   * A counter that is automatically incremented with each turn of the conversation. A value of 1 indicates that this is
+   * the the first turn of a new conversation, which can affect the behavior of some skills.
    *
    * @return the turnCount
    */

config.properties.enc

@@ -1,19 +1,22 @@
 # Conversation
 
+## Deprecation notice
+Conversation will be removed in the next major release. Please migrate to Assistant v1 or v2.
+
 ## Installation
 
 ##### Maven
 ```xml
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>conversation</artifactId>
-  <version>6.7.0</version>
+  <version>6.8.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:conversation:6.7.0'
+'com.ibm.watson.developer_cloud:conversation:6.8.0'
 ```
 
 ## Usage

conversation/README.md

@@ -95,7 +95,9 @@
  *
  * @version v1
  * @see <a href="http://www.ibm.com/watson/developercloud/conversation.html">Conversation</a>
+ * @deprecated Conversation will be removed in the next major release. Please migrate to Assistant v1 or v2.
  */
+@Deprecated
 public class Conversation extends WatsonService {
 
   private static final String SERVICE_NAME = "conversation";

conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/Conversation.java

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