Merge branch 'master' into assistant-update

Author: mediumTaj

.utility/decrypt-service-instance-apikeys.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
   echo -e "Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"
-  openssl aes-256-cbc -K $encrypted_5b4197fb87e6_key -iv $encrypted_5b4197fb87e6_iv \
+  openssl aes-256-cbc -K $encrypted_b3aab48b571a_key -iv $encrypted_b3aab48b571a_iv \
   -in config.properties.enc -out common/src/test/resources/config.properties -d
 else
   echo -e "Not Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"

README.md

@@ -275,20 +275,24 @@ System.out.println("Response header names: " + responseHeaders.names());
 
 ### Configuring the HTTP client
 
-The HTTP client can be configured by using the `configureClient()` method on your service object, passing in an `HttpConfigOptions` object. Currently, the following options are supported:
+The HTTP client can be configured by using the `setProxy()` method on your authenticator and using the `configureClient()` method on your service object, passing in an `HttpConfigOptions` object. Currently, the following options are supported:
 - Disabling SSL verification (only do this if you really mean to!) ⚠️
 - Using a proxy (more info here: [OkHTTPClient Proxy authentication how to?](https://stackoverflow.com/a/35567936/456564))
 - Setting HTTP logging verbosity
 
 Here's an example of setting the above:
 
 ```java
-Discovery service = new Discovery("2019-04-30");
+Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("proxyHost", 8080));
+IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+authenticator.setProxy(proxy);
+
+Discovery service = new Discovery("2019-04-30", authenticator);
 
 // setting configuration options
 HttpConfigOptions options = new HttpConfigOptions.Builder()
   .disableSslVerification(true)
-  .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("proxyHost", 8080)))
+  .proxy(proxy)
   .loggingLevel(HttpConfigOptions.LoggingLevel.BASIC)
   .build();
 

assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java

@@ -1821,7 +1821,7 @@ public void testDeleteUserData() {
   /** Test list mentions. */
   @Test
   public void testListMentions() {
-    String entity = "holiday";
+    String entity = "beverage";
 
     ListMentionsOptions listMentionsOptions =
         new ListMentionsOptions.Builder().workspaceId(workspaceId).entity(entity).build();