Merge pull request #951 from watson-developer-cloud/develop

Changes for release v6.1.0

Author: lpatino10

.gitignore

@@ -20,3 +20,5 @@ docs
 .vscode/
 conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationTest.java
 .swagger-codegen/VERSION
+*.orig
+*.rej

.utility/generate-api-diff.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Author: Hanbin Cho ([email protected])
 # Description: This script 1) downloads the latest java-sdk jar published in Maven Repo 2) builds the jar of current java-sdk version, then 3) generate an API diff report of the two versions.
 # Assumptions
-# 1. This script is placed in the project root of java-sdk.
+# 1. This script is placed in .utility folder of the java-sdk.
 # 2. Version format is [0-9].[0-9].[0-9]
 
 # Step 1: Download the latest release of java-sdk published in Maven Repository.
@@ -34,7 +34,7 @@ popd
 ./gradlew shadowJar
 
 # Step 5: Construct the filepath to the current version of java-sdk.
-CURRENT_VERSION=`cat gradle.properties | grep "version=[0-9]\.[0-9]\.[0-9]" | cut -d '=' -f 2`
+CURRENT_VERSION=`cat ../gradle.properties | grep "version=[0-9]\.[0-9]\.[0-9]" | cut -d '=' -f 2`
 CURRENT_JAR_FILENAME="java-sdk-${CURRENT_VERSION}-jar-with-dependencies.jar"
 CURRENT_JAR_BASEPATH="java-sdk/build/libs"
 CURRENT_JAR_PATH="${CURRENT_JAR_BASEPATH}/${CURRENT_JAR_FILENAME}"
@@ -46,5 +46,4 @@ if [ ! -f $CURRENT_JAR_PATH ]; then
 fi
 
 # Step 7: Produce an API diff between the latest release and the current version using japicmp module.
-# TODO: Figure out how to set japicmp task's properties (oldClasspath and newClasspath) through command-line invocation.
 ./gradlew japicmp -PoldJarPath="${LATEST_RELEASE_JAR_PATH}" -PnewJarPath="${CURRENT_JAR_PATH}" -PoldJarVersion="${LATEST_RELEASE_VERSION}" -PnewJarVersion="${CURRENT_VERSION}"

.utility/generate_apidiff_index_html.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # based on https://odoepner.wordpress.com/2012/02/17/shell-script-to-generate-simple-index-html/
 

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateDialogNodeOptions.java

@@ -452,8 +452,9 @@ public String workspaceId() {
   /**
    * Gets the dialogNode.
    *
-   * The dialog node ID. This string must conform to the following restrictions: - It can contain only Unicode
-   * alphanumeric, space, underscore, hyphen, and dot characters. - It must be no longer than 1024 characters.
+   * The dialog node ID. This string must conform to the following restrictions:
+   * - It can contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters.
+   * - It must be no longer than 1024 characters.
    *
    * @return the dialogNode
    */
@@ -566,9 +567,9 @@ public List<DialogNodeAction> actions() {
   /**
    * Gets the title.
    *
-   * The alias used to identify the dialog node. This string must conform to the following restrictions: - It can
-   * contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters. - It must be no longer than 64
-   * characters.
+   * The alias used to identify the dialog node. This string must conform to the following restrictions:
+   * - It can contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters.
+   * - It must be no longer than 64 characters.
    *
    * @return the title
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateEntity.java

@@ -167,9 +167,10 @@ public Builder newBuilder() {
   /**
    * Gets the entity.
    *
-   * The name of the entity. This string must conform to the following restrictions: - It can contain only Unicode
-   * alphanumeric, underscore, and hyphen characters. - It cannot begin with the reserved prefix `sys-`. - It must be no
-   * longer than 64 characters.
+   * The name of the entity. This string must conform to the following restrictions:
+   * - It can contain only Unicode alphanumeric, underscore, and hyphen characters.
+   * - It cannot begin with the reserved prefix `sys-`.
+   * - It must be no longer than 64 characters.
    *
    * @return the entity
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateEntityOptions.java

@@ -194,9 +194,10 @@ public String workspaceId() {
   /**
    * Gets the entity.
    *
-   * The name of the entity. This string must conform to the following restrictions: - It can contain only Unicode
-   * alphanumeric, underscore, and hyphen characters. - It cannot begin with the reserved prefix `sys-`. - It must be no
-   * longer than 64 characters.
+   * The name of the entity. This string must conform to the following restrictions:
+   * - It can contain only Unicode alphanumeric, underscore, and hyphen characters.
+   * - It cannot begin with the reserved prefix `sys-`.
+   * - It must be no longer than 64 characters.
    *
    * @return the entity
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateExample.java

@@ -85,9 +85,10 @@ public Builder newBuilder() {
   /**
    * Gets the text.
    *
-   * The text of a user input example. This string must conform to the following restrictions: - It cannot contain
-   * carriage return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no
-   * longer than 1024 characters.
+   * The text of a user input example. This string must conform to the following restrictions:
+   * - It cannot contain carriage return, newline, or tab characters.
+   * - It cannot consist of only whitespace characters.
+   * - It must be no longer than 1024 characters.
    *
    * @return the text
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateExampleOptions.java

@@ -143,9 +143,10 @@ public String intent() {
   /**
    * Gets the text.
    *
-   * The text of a user input example. This string must conform to the following restrictions: - It cannot contain
-   * carriage return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no
-   * longer than 1024 characters.
+   * The text of a user input example. This string must conform to the following restrictions:
+   * - It cannot contain carriage return, newline, or tab characters.
+   * - It cannot consist of only whitespace characters.
+   * - It must be no longer than 1024 characters.
    *
    * @return the text
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateIntent.java

@@ -134,9 +134,10 @@ public Builder newBuilder() {
   /**
    * Gets the intent.
    *
-   * The name of the intent. This string must conform to the following restrictions: - It can contain only Unicode
-   * alphanumeric, underscore, hyphen, and dot characters. - It cannot begin with the reserved prefix `sys-`. - It must
-   * be no longer than 128 characters.
+   * The name of the intent. This string must conform to the following restrictions:
+   * - It can contain only Unicode alphanumeric, underscore, hyphen, and dot characters.
+   * - It cannot begin with the reserved prefix `sys-`.
+   * - It must be no longer than 128 characters.
    *
    * @return the intent
    */

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateIntentOptions.java

@@ -163,9 +163,10 @@ public String workspaceId() {
   /**
    * Gets the intent.
    *
-   * The name of the intent. This string must conform to the following restrictions: - It can contain only Unicode
-   * alphanumeric, underscore, hyphen, and dot characters. - It cannot begin with the reserved prefix `sys-`. - It must
-   * be no longer than 128 characters.
+   * The name of the intent. This string must conform to the following restrictions:
+   * - It can contain only Unicode alphanumeric, underscore, hyphen, and dot characters.
+   * - It cannot begin with the reserved prefix `sys-`.
+   * - It must be no longer than 128 characters.
    *
    * @return the intent
    */