Merge pull request #1049 from watson-developer-cloud/service-updates

Add updates from services

Author: lpatino10

.bumpversion.cfg

@@ -9,6 +9,8 @@ message = Update version numbers from {current_version} -> {new_version}
 
 [bumpversion:file:assistant/README.md]
 
+[bumpversion:file:compare-comply/README.md]
+
 [bumpversion:file:discovery/README.md]
 
 [bumpversion:file:language-translator/README.md]

.gitignore

@@ -26,4 +26,6 @@ compare-comply/src/test/resources/compare_comply/cloud-object-storage-credential
 compare-comply/src/test/resources/compare_comply/cloud-object-storage-credentials-output.json
 secrets.tar
 package-lock.json
-*.mlmodel
+*.mlmodel
+.openapi-generator-ignore
+.openapi-generator/

.releaserc

@@ -1,5 +1,5 @@
 {
-  "branch": "bintray-deploy",
+  "branch": "master",
   "tagFormat": "java-sdk-${version}",
   "plugins": [
     "@semantic-release/commit-analyzer",

.travis.yml

@@ -22,16 +22,16 @@ before_install:
     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
-#- npm install -g [email protected]
-#- nvm install 'lts/*'
-#- sudo apt-get update
-#- sudo apt-get install python
+- npm install -g [email protected]
+- nvm install 'lts/*'
+- sudo apt-get update
+- sudo apt-get install python
 install:
 - if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then cd appscan; make asoc-tool; cd
   ../; fi
-#- npm install -g [email protected]
-#- npm install @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/git @semantic-release/github @semantic-release/exec -D
-#- pip install --user bumpversion
+- npm install -g [email protected]
+- npm install @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/git @semantic-release/github @semantic-release/exec -D
+- pip install --user bumpversion
 before_script:
 - if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then chmod a+x ./appscan/ASOC.sh; fi
 - env
@@ -54,14 +54,14 @@ deploy:
   skip_cleanup: true
   script: "./gradlew bintrayUpload"
   on:
-    branch: bintray-deploy
+    tags: true
+    jdk: openjdk7
+- provider: script
+  skip_cleanup: true
+  script: "semantic-release"
+  on:
+    branch: master
     jdk: openjdk7
-#- provider: script
-#  skip_cleanup: true
-#  script: "semantic-release"
-#  on:
-#    branch: bintray-deploy
-#    jdk: openjdk7
 - provider: script
   script: ".utility/push-javadoc-to-gh-pages.sh"
   skip_cleanup: true

.utility/bintray-release.gradle

@@ -13,7 +13,6 @@ bintray {
     user = System.getenv('BINTRAY_USER')
     key =  System.getenv('BINTRAY_APIKEY')
     publications = ['maven']
-    dryRun = true
     publish = true
     pkg {
         repo = 'ibm-cloud-sdk-repo'

CHANGELOG.md

@@ -1,3 +1,22 @@
+# v7.0.0
+Hello! If you're reading this, you're probably upgrading to **v7.0.0** of the Watson Java SDK. If that's the case, this guide will help you transition smoothly to get on board with the latest Watson API features in your Java code. Let's get started!
+
+## **Big** things
+### New library name
+For this release, we've changed package managers and decided to change the name along with it. Be sure to change this when upgrading by looking at the installation instructions in the README: https://github.com/watson-developer-cloud/java-sdk#installation
+
+### Response formats
+For a while now, we've had three main methods to execute an API call: `execute()`, `enqueue()`, and `rx()`. In our `v5.3.0` release, we added some variations of those methods to return not only the basic response model, but some added HTTP information like response headers.
+
+In this release, we've dropped those variants and instead have modified the base methods to always return the extra information. In addition, we've replaced `rx()` with `reactiveRequest()`, which lets you leverage [RxJava](https://github.com/ReactiveX/RxJava) to do some reactive programming if that's your thing.
+
+In short, the general structure of responses is different and you can read more about that [here](https://github.com/watson-developer-cloud/java-sdk#parsing-responses). If you're looking for making asynchronous API calls, you can read the details about that and the new `reactiveRequest()` method [here](https://github.com/watson-developer-cloud/java-sdk#making-asynchronous-api-calls).
+
+## Everything else
+Along with the major changes above, there have been more detailed breaking changes across services with API changes and updates to the SDK design. You can find these nitty-gritty details in the [release notes](https://github.com/watson-developer-cloud/java-sdk/releases/tag/java-sdk-7.0.0), along with the changes that are non-breaking.
+
+---
+
 # 4.0
 
 ## Conversation

MIGRATION.md

@@ -48,8 +48,10 @@ Java client library to use the [Watson APIs][wdc].
 
 </details>
 
-## Migration notice
-With the change to v7.0.0, the package name has changed. Be sure to look closely at the installation instructions for the new version!
+:speaking_head: :speaking_head: :speaking_head:
+## Heads up!
+`v7.0.0` is out! Be sure to check out the [migration guide](https://github.com/watson-developer-cloud/java-sdk/blob/java-sdk-7.0.0/MIGRATION.md) for major breaking changes and the [release notes](https://github.com/watson-developer-cloud/java-sdk/releases/tag/java-sdk-7.0.0) for extra info.
+:speaking_head: :speaking_head: :speaking_head:
 
 ## Before you begin
 * You need an [IBM Cloud][ibm-cloud-onboarding] account.
@@ -64,7 +66,7 @@ All the services:
 <dependency>
 	<groupId>com.ibm.watson</groupId>
 	<artifactId>ibm-watson</artifactId>
-	<version>7.0.0</version>
+	<version>6.14.0</version>
 </dependency>
 ```
 
@@ -74,7 +76,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson</groupId>
 	<artifactId>discovery</artifactId>
-	<version>7.0.0</version>
+	<version>6.14.0</version>
 </dependency>
 ```
 
@@ -83,13 +85,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson:ibm-watson:7.0.0'
+'com.ibm.watson:ibm-watson:6.14.0'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson:assistant:7.0.0'
+'com.ibm.watson:assistant:6.14.0'
 ```
 
 ##### JAR

README.md

@@ -5,15 +5,15 @@
 ##### Maven
 ```xml
 <dependency>
-  <groupId>com.ibm.watson.developer_cloud</groupId>
+  <groupId>com.ibm.watson</groupId>
   <artifactId>assistant</artifactId>
   <version>6.14.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.14.0'
+'com.ibm.watson:assistant:6.14.0'
 ```
 
 ## Usage
@@ -22,15 +22,16 @@ Use the [Assistant][assistant] service to identify intents, entities, and conduc
 ### Using Assistant v1
 ```java
 // make sure to use the Assistant v1 import!
-import com.ibm.watson.developer_cloud.assistant.v1.Assistant;
+import com.ibm.watson.assistant.v1.Assistant;
 
 Assistant service = new Assistant("2018-02-16");
 IamOptions options = new IamOptions.Builder()
   .apiKey("<iam_api_key>")
   .build();
 service.setIamCredentials(options);
 
-InputData input = new InputData.Builder("Hi").build();
+MessageInput input = new MessageInput();
+input.setText("Hi");
 MessageOptions options = new MessageOptions.Builder(workspaceId)
   .input(input)
   .build();
@@ -41,24 +42,27 @@ System.out.println(response);
 Maintaining context across messages:
 ```java
 // make sure to use the Assistant v1 import!
-import com.ibm.watson.developer_cloud.assistant.v1.Assistant;
+import com.ibm.watson.assistant.v1.Assistant;
 
 Context context = null;
+MessageInput input = new MessageInput();
 
 // first message
+input.setText("First message");
 MessageOptions newMessageOptions = new MessageOptions.Builder()
   .workspaceId("<workspace-id>")
-  .input(new InputData.Builder("First message").build())
+  .input(input)
   .context(context)
   .build();
 
 MessageResponse response = service.message(newMessageOptions).execute().getResult();
 context = response.getContext();
 
 // second message
+input.setText("Second message");
 newMessageOptions = new MessageOptions.Builder()
   .workspaceId("<workspace-id>")
-  .input(new InputData.Builder("Second message").build())
+  .input(input)
   .context(context) // using context from the first message
   .build();
 
@@ -72,7 +76,7 @@ System.out.println(response);
 ### Using Assistant v2
 ```java
 // make sure to use the Assistant v2 import!
-import com.ibm.watson.developer_cloud.assistant.v2.Assistant;
+import com.ibm.watson.assistant.v2.Assistant;
 
 Assistant service = new Assistant("2018-09-20");
 IamOptions options = new IamOptions.Builder()
@@ -96,7 +100,7 @@ System.out.println(messageResponse);
 Maintaining context across messages:
 ```java
 // make sure to use the Assistant v2 import!
-import com.ibm.watson.developer_cloud.assistant.v2.Assistant;
+import com.ibm.watson.assistant.v2.Assistant;
 
 MessageContext context = new MessageContext();