Merge pull request #1002 from watson-developer-cloud/ssl-disable-fix

Ensure HTTP client modification happens on the first call
watson-developer-cloud · Nov 7, 2018 · 8daa212 · 8daa212
2 parents ec3abee + 3d6e6a7
commit 8daa212
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 41 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.9.0
+current_version = 6.9.1
 commit = True
 message = docs: Update version numbers from {current_version} -> {new_version}
 

diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ All the services:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>java-sdk</artifactId>
-	<version>6.9.0</version>
+	<version>6.9.1</version>
 </dependency>
 ```
 
@@ -70,7 +70,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>discovery</artifactId>
-	<version>6.9.0</version>
+	<version>6.9.1</version>
 </dependency>
 ```
 
@@ -79,13 +79,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-sdk:6.9.0'
+'com.ibm.watson.developer_cloud:java-sdk:6.9.1'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.9.0'
+'com.ibm.watson.developer_cloud:assistant:6.9.1'
 ```
 
 ##### 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.9.1-SNAPSHOT'
+'com.ibm.watson.developer_cloud:speech-to-text:6.9.2-SNAPSHOT'
 ```
 
 ##### JAR
@@ -347,7 +347,7 @@ Gradle:
 
 ```sh
 cd java-sdk
-gradle jar  # build jar file (build/libs/watson-developer-cloud-6.9.0.jar)
+gradle jar  # build jar file (build/libs/watson-developer-cloud-6.9.1.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 +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.9.0/java-sdk-6.9.0-jar-with-dependencies.jar
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.9.1/java-sdk-6.9.1-jar-with-dependencies.jar
diff --git a/assistant/README.md b/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.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.9.0'
+'com.ibm.watson.developer_cloud:assistant:6.9.1'
 ```
 
 ## Usage

diff --git a/conversation/README.md b/conversation/README.md
@@ -10,13 +10,13 @@ Conversation will be removed in the next major release. Please migrate to Assist
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>conversation</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:conversation:6.9.0'
+'com.ibm.watson.developer_cloud:conversation:6.9.1'
 ```
 
 ## Usage

diff --git a/core/src/main/java/com/ibm/watson/developer_cloud/http/HttpClientSingleton.java b/core/src/main/java/com/ibm/watson/developer_cloud/http/HttpClientSingleton.java
@@ -226,17 +226,18 @@ public OkHttpClient createHttpClient() {
    * Configures the current {@link OkHttpClient} instance based on the passed-in options.
    *
    * @param options the {@link HttpConfigOptions} object for modifying the client
+   * @return the client
    */
-  public void configureClient(HttpConfigOptions options) {
-    if (options == null) {
-      return;
+  public OkHttpClient configureClient(HttpConfigOptions options) {
+    if (options != null) {
+      if (options.shouldDisableSslVerification()) {
+        disableSslVerification();
+      }
+      if (options.getProxy() != null) {
+        setProxy(options.getProxy());
+      }
     }
 
-    if (options.shouldDisableSslVerification()) {
-      disableSslVerification();
-    }
-    if (options.getProxy() != null) {
-      setProxy(options.getProxy());
-    }
+    return okHttpClient;
   }
 }
diff --git a/core/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java b/core/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
@@ -167,12 +167,12 @@ protected OkHttpClient configureHttpClient() {
   }
 
   /**
-   * Configures the inner HTML client based on the passed-in options.
+   * Configures the {@link OkHttpClient} based on the passed-in options.
    *
    * @param options the {@link HttpConfigOptions} object for modifying the client
    */
   public void configureClient(HttpConfigOptions options) {
-    HttpClientSingleton.getInstance().configureClient(options);
+    client = HttpClientSingleton.getInstance().configureClient(options);
   }
 
   /**

diff --git a/discovery/README.md b/discovery/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>discovery</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:discovery:6.9.0'
+'com.ibm.watson.developer_cloud:discovery:6.9.1'
 ```
 
 ## Usage

diff --git a/language-translator/README.md b/language-translator/README.md
@@ -10,13 +10,13 @@ Language Translator v3 is now available. The v2 Language Translator API will no
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>language-translator</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:language-translator:6.9.0'
+'com.ibm.watson.developer_cloud:language-translator:6.9.1'
 ```
 
 ## Usage

diff --git a/natural-language-classifier/README.md b/natural-language-classifier/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>natural-language-classifier</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:natural-language-classifier:6.9.0'
+'com.ibm.watson.developer_cloud:natural-language-classifier:6.9.1'
 ```
 
 ## Usage

diff --git a/natural-language-understanding/README.md b/natural-language-understanding/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>natural-language-understanding</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:natural-language-understanding:6.9.0'
+'com.ibm.watson.developer_cloud:natural-language-understanding:6.9.1'
 ```
 
 ## Usage

diff --git a/personality-insights/README.md b/personality-insights/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>personality-insights</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:personality-insights:6.9.0'
+'com.ibm.watson.developer_cloud:personality-insights:6.9.1'
 ```
 
 ## Usage

diff --git a/speech-to-text/README.md b/speech-to-text/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>speech-to-text</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:speech-to-text:6.9.0'
+'com.ibm.watson.developer_cloud:speech-to-text:6.9.1'
 ```
 
 ## Usage

diff --git a/text-to-speech/README.md b/text-to-speech/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>text-to-speech</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:text-to-speech:6.9.0'
+'com.ibm.watson.developer_cloud:text-to-speech:6.9.1'
 ```
 
 ## Usage

diff --git a/tone-analyzer/README.md b/tone-analyzer/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>tone-analyzer</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:tone-analyzer:6.9.0'
+'com.ibm.watson.developer_cloud:tone-analyzer:6.9.1'
 ```
 
 ## Usage

diff --git a/visual-recognition/README.md b/visual-recognition/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>visual-recognition</artifactId>
-  <version>6.9.0</version>
+  <version>6.9.1</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:visual-recognition:6.9.0'
+'com.ibm.watson.developer_cloud:visual-recognition:6.9.1'
 ```
 
 ## Usage