Merge pull request #1014 from watson-developer-cloud/compare-and-comply

Release 6.10.0

Author: lpatino10

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
-current_version = 6.9.3
+current_version = 6.10.0
 commit = True
-message = docs: Update version numbers from {current_version} -> {new_version}
+message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
 
 [bumpversion:file:README.md]
 

.gitignore

@@ -21,4 +21,7 @@ docs
 conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationTest.java
 .swagger-codegen/VERSION
 *.orig
-*.rej
+*.rej
+compare-comply/src/test/resources/compare_comply/cloud-object-storage-credentials-input.json
+compare-comply/src/test/resources/compare_comply/cloud-object-storage-credentials-output.json
+secrets.tar

.travis.yml

@@ -2,64 +2,58 @@ language: java
 sudo: required
 dist: trusty
 jdk:
-  - openjdk7
-  - oraclejdk8
-
+- openjdk7
+- oraclejdk8
 branches:
   except:
   - gh-pages
-
 before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-
+- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
-    - $HOME/.m2
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+  - "$HOME/.m2"
+  - "$HOME/.gradle/caches/"
+  - "$HOME/.gradle/wrapper/"
 env:
   global:
   - secure: S2KIWOJX35j1FczyV7JRFrFpTftb8Hmkf6C50bJh8E03IbPu7tnX2znPKBbRWcIQndO6qd5dL7+BqtXabByOzd5Slj5/NBdXPcGffsO7B0cpFQS8ngpIMAGReCXQ12PbOiO8CIk2f/20lU3L0kqcP1TaPyZYIlSwkUg98ls8p90=
   - secure: eLv41LVZoRCqQehOM29RLodZ6NZhrIdLWklAkMdLGlFDEiVY5f0shaPLffpUiuv/3pg+CuQk9ffBc72m8lwTsimex9unC/WVsqQJhqQEWJEaPGL0UamV/HqHMeBQEpKiCcKHaBRHFGk7QQJVtiXvVvlbwk7Jks5giUR7+s/Q6iI=
   - secure: l0dde5NSGedD6fny5aMr1ll90FYVd7IKDsZ0Kd1GWnB+iDd3rjDBwz5q6NUwN2LTqw3jWFqmqdEnGUGO3Er0rdfdtPh3K194sTK3XuCZz8GEjFvYAEDRQ59oyK8fhw60c86cWppBQ4gluLKLstm12DLkARTUvJiIsTQTnuc2YGg=
-
 before_install:
-  - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
-  # Work around missing crypto in openjdk7
-  - |
-    if [ "$TRAVIS_JDK_VERSION" == "openjdk7" ]; then
-      sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-158.jar"
-      sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
-      echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security
-    fi
-
+- sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g'
+  ~/.m2/settings.xml
+- |
+  if [ "$TRAVIS_JDK_VERSION" == "openjdk7" ]; then
+    sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-158.jar"
+    sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
+    echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security
+  fi
 install:
-  - 'if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then cd appscan; make asoc-tool; cd ../; fi'
-
+- if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then cd appscan; make asoc-tool; cd
+  ../; fi
 before_script:
-  - 'if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then chmod a+x ./appscan/ASOC.sh; fi'
-
+- if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then chmod a+x ./appscan/ASOC.sh; fi
 script:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_42d9c68e608d_key -iv $encrypted_42d9c68e608d_iv -in config.properties.enc -out core/src/test/resources/config.properties -d || true'
-  - 'if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then ./appscan/ASOC.sh; fi'
-  - ./gradlew install -x check
-  - ./gradlew checkstyleMain
-  - ./gradlew checkstyleTest
-  - ./gradlew codeCoverageReport --continue
-  - ./gradlew docs > /dev/null # build the javadoc
-
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ]
+  && openssl aes-256-cbc -K $encrypted_42d9c68e608d_key -iv $encrypted_42d9c68e608d_iv -in secrets.tar.enc -out secrets.tar -d
+  && tar xvf secrets.tar
+  || true'
+- if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then ./appscan/ASOC.sh; fi
+- "./gradlew install -x check"
+- "./gradlew checkstyleMain"
+- "./gradlew checkstyleTest"
+- "./gradlew codeCoverageReport --continue"
+- "./gradlew docs > /dev/null"
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
-
+- bash <(curl -s https://codecov.io/bash)
 deploy:
-  - provider: script
-    script: .utility/push-javadoc-to-gh-pages.sh
-    skip_cleanup: true
-    on:
-      repo: watson-developer-cloud/java-sdk
-      jdk: openjdk7
-      tags: true
-
+- provider: script
+  script: ".utility/push-javadoc-to-gh-pages.sh"
+  skip_cleanup: true
+  on:
+    repo: watson-developer-cloud/java-sdk
+    jdk: openjdk7
+    tags: true
 notifications:
   email: true

README.md

@@ -22,6 +22,7 @@ Java client library to use the [Watson APIs][wdc].
     * [API key](#api-key)
   * IBM Watson Services
     * [Assistant](assistant)
+    * [Compare and Comply](compare-comply)
     * [Discovery](discovery)
     * [Language Translator](language-translator)
     * [Natural Language Classifier](natural-language-classifier)
@@ -60,7 +61,7 @@ All the services:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>java-sdk</artifactId>
-	<version>6.9.3</version>
+	<version>6.10.0</version>
 </dependency>
 ```
 
@@ -70,7 +71,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>discovery</artifactId>
-	<version>6.9.3</version>
+	<version>6.10.0</version>
 </dependency>
 ```
 
@@ -79,13 +80,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-sdk:6.9.3'
+'com.ibm.watson.developer_cloud:java-sdk:6.10.0'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.9.3'
+'com.ibm.watson.developer_cloud:assistant:6.10.0'
 ```
 
 ##### Development snapshots
@@ -108,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.9.4-SNAPSHOT'
+'com.ibm.watson.developer_cloud:speech-to-text:6.10.1-SNAPSHOT'
 ```
 
 ##### JAR
@@ -347,7 +348,7 @@ Gradle:
 
 ```sh
 cd java-sdk
-gradle jar  # build jar file (build/libs/watson-developer-cloud-6.9.3.jar)
+gradle jar  # build jar file (build/libs/watson-developer-cloud-6.10.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)
@@ -400,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.9.3/java-sdk-6.9.3-jar-with-dependencies.jar
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.10.0/java-sdk-6.10.0-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.3</version>
+  <version>6.10.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.9.3'
+'com.ibm.watson.developer_cloud:assistant:6.10.0'
 ```
 
 ## Usage

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/Assistant.java

@@ -152,7 +152,7 @@ public Assistant(String versionDate, IamOptions iamOptions) {
   /**
    * Get response to user input.
    *
-   * Get a response to a user's input.
+   * Send user input to a workspace and receive a response.
    *
    * There is no rate limit for this operation.
    *
@@ -303,6 +303,9 @@ public ServiceCall<WorkspaceExport> getWorkspace(GetWorkspaceOptions getWorkspac
     if (getWorkspaceOptions.includeAudit() != null) {
       builder.query("include_audit", String.valueOf(getWorkspaceOptions.includeAudit()));
     }
+    if (getWorkspaceOptions.sort() != null) {
+      builder.query("sort", getWorkspaceOptions.sort());
+    }
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(WorkspaceExport.class));
   }
 
@@ -820,7 +823,7 @@ public ServiceCall<Counterexample> updateCounterexample(UpdateCounterexampleOpti
   /**
    * Create entity.
    *
-   * Create a new entity.
+   * Create a new entity, or enable a system entity.
    *
    * This operation is limited to 1000 requests per 30 minutes. For more information, see **Rate limiting**.
    *
@@ -855,7 +858,7 @@ public ServiceCall<Entity> createEntity(CreateEntityOptions createEntityOptions)
   /**
    * Delete entity.
    *
-   * Delete an entity from a workspace.
+   * Delete an entity from a workspace, or disable a system entity.
    *
    * This operation is limited to 1000 requests per 30 minutes. For more information, see **Rate limiting**.
    *

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

@@ -26,6 +26,8 @@ public class Context extends DynamicModel {
   }.getType();
   private Type systemType = new TypeToken<SystemResponse>() {
   }.getType();
+  private Type metadataType = new TypeToken<MessageContextMetadata>() {
+  }.getType();
 
   /**
    * Gets the conversationId.
@@ -45,6 +47,15 @@ public SystemResponse getSystem() {
     return GsonSerializationHelper.serializeDynamicModelProperty(this.get("system"), systemType);
   }
 
+  /**
+   * Gets the metadata.
+   *
+   * @return the metadata
+   */
+  public MessageContextMetadata getMetadata() {
+    return GsonSerializationHelper.serializeDynamicModelProperty(this.get("metadata"), metadataType);
+  }
+
   /**
    * Sets the conversationId.
    *
@@ -62,4 +73,13 @@ public void setConversationId(final String conversationId) {
   public void setSystem(final SystemResponse system) {
     this.put("system", system);
   }
+
+  /**
+   * Sets the metadata.
+   *
+   * @param metadata the new metadata
+   */
+  public void setMetadata(final MessageContextMetadata metadata) {
+    this.put("metadata", metadata);
+  }
 }

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

@@ -541,7 +541,7 @@ public Map metadata() {
   /**
    * Gets the nextStep.
    *
-   * The next step to be executed in dialog processing.
+   * The next step to execute following this dialog node.
    *
    * @return the nextStep
    */

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

@@ -560,7 +560,7 @@ public Map metadata() {
   /**
    * Gets the nextStep.
    *
-   * The next step to be executed in dialog processing.
+   * The next step to execute following this dialog node.
    *
    * @return the nextStep
    */

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

@@ -169,9 +169,11 @@ public Builder newBuilder() {
    *
    * 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.
    *
+   * If you specify an entity name beginning with the reserved prefix `sys-`, it must be the name of a system entity
+   * that you want to enable. (Any entity content specified with the request is ignored.).
+   *
    * @return the entity
    */
   public String entity() {