Merge pull request #979 from watson-developer-cloud/websocket-upgrades

lpatino10 · web-flow · commit b16dfbeb9170 · 2018-08-21T11:01:19.000-04:00
Add support for more concurrent WebSocket connections
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.0
+current_version = 6.5.0
 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.4.0</version>
+	<version>6.5.0</version>
 </dependency>
 ```
 
@@ -70,7 +70,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>discovery</artifactId>
-	<version>6.4.0</version>
+	<version>6.5.0</version>
 </dependency>
 ```
 
@@ -79,13 +79,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-sdk:6.4.0'
+'com.ibm.watson.developer_cloud:java-sdk:6.5.0'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.4.0'
+'com.ibm.watson.developer_cloud:assistant:6.5.0'
 ```
 
 ##### 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.4.1-SNAPSHOT'
+'com.ibm.watson.developer_cloud:speech-to-text:6.5.1-SNAPSHOT'
 ```
 
 ##### JAR
@@ -375,7 +375,7 @@ Gradle:
 
 ```sh
 cd java-sdk
-gradle jar  # build jar file (build/libs/watson-developer-cloud-6.4.0.jar)
+gradle jar  # build jar file (build/libs/watson-developer-cloud-6.5.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)
@@ -428,4 +428,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.4.0/java-sdk-6.4.0-jar-with-dependencies.jar
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.5.0/java-sdk-6.5.0-jar-with-dependencies.jar
diff --git a/assistant/README.md b/assistant/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>assistant</artifactId>
-  <version>6.4.0</version>
+  <version>6.5.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.4.0'
+'com.ibm.watson.developer_cloud:assistant:6.5.0'
 ```
 
 ## Usage
diff --git a/assistant/build.gradle b/assistant/build.gradle
@@ -25,7 +25,7 @@ task sourcesJar(type: Jar) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
diff --git a/build.gradle b/build.gradle
@@ -51,14 +51,14 @@ allprojects {
   targetCompatibility = JavaVersion.VERSION_1_7
 
   repositories {
-    mavenCentral()
+      maven { url = "http://repo.maven.apache.org/maven2" }
   }
 }
 
 subprojects {
 
   dependencies {
-    testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.8.0'
+    testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.11.0'
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
     testCompile group: 'com.google.guava', name: 'guava', version: '20.0'
     testCompile group: 'junit', name: 'junit', version: '4.12'
diff --git a/conversation/README.md b/conversation/README.md
@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>conversation</artifactId>
-  <version>6.4.0</version>
+  <version>6.5.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:conversation:6.4.0'
+'com.ibm.watson.developer_cloud:conversation:6.5.0'
 ```
 
 ## Usage
diff --git a/conversation/build.gradle b/conversation/build.gradle
@@ -25,7 +25,7 @@ task sourcesJar(type: Jar) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
diff --git a/core/build.gradle b/core/build.gradle
@@ -25,7 +25,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
@@ -69,9 +69,9 @@ checkstyle {
   }
 
 dependencies {
-    compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.8.0'
-    compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '3.8.0'
-    compile group: 'com.squareup.okhttp3', name: 'okhttp-urlconnection', version: '3.8.0'
+    compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.11.0'
+    compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '3.11.0'
+    compile group: 'com.squareup.okhttp3', name: 'okhttp-urlconnection', version: '3.11.0'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
     compile group: 'org.glassfish.jersey.bundles.repackaged', name: 'jersey-jsr166e', version: '2.25.1'
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.4.0</version>
+  <version>6.5.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:discovery:6.4.0'
+'com.ibm.watson.developer_cloud:discovery:6.5.0'
 ```
 
 ## Usage
diff --git a/discovery/build.gradle b/discovery/build.gradle
@@ -25,7 +25,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
diff --git a/discovery/src/test/java/com/ibm/watson/developer_cloud/discovery/v1/DiscoveryServiceTest.java b/discovery/src/test/java/com/ibm/watson/developer_cloud/discovery/v1/DiscoveryServiceTest.java
@@ -142,11 +142,11 @@ public class DiscoveryServiceTest extends WatsonServiceUnitTest {
       + VERSION;
   private static final String Q1_PATH = "/v1/environments/mock_envid/collections/mock_collid/query?version="
       + VERSION
-      + "&filter=field:1"
-      + "&query=field:1&count=5&return=field&offset=5";
+      + "&filter=field%3A1&query=field%3A1&count=5&return=field&offset=5"
+      + "&similar=true&similar.document_ids=doc1%2Cdoc2&similar.fields=field1%2Cfield2";
   private static final String Q2_PATH = "/v1/environments/mock_envid/collections/mock_collid/query?version="
       + VERSION
-      + "&aggregation=term(field)";
+      + "&aggregation=term%28field%29";
   private static final String Q3_PATH = "/v1/environments/mock_envid/query?version="
       + VERSION + "&collection_ids=mock_collid";
   private static final String Q4_PATH = "/v1/environments/mock_envid/notices?version="
@@ -720,8 +720,7 @@ public void queryIsSuccessful() throws InterruptedException {
     QueryResponse response = discoveryService.query(queryBuilder.build()).execute();
     RecordedRequest request = server.takeRequest();
 
-    assertEquals(Q1_PATH + "&similar=true&similar.document_ids=doc1,doc2&similar.fields=field1,field2",
-        request.getPath());
+    assertEquals(Q1_PATH, request.getPath());
     assertEquals(GET, request.getMethod());
     assertEquals(GsonSingleton.getGson().toJsonTree(queryResp), GsonSingleton.getGson().toJsonTree(response));
   }
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -20,7 +20,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle
@@ -32,7 +32,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
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.4.0</version>
+  <version>6.5.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:language-translator:6.4.0'
+'com.ibm.watson.developer_cloud:language-translator:6.5.0'
 ```
 
 ## Usage
diff --git a/language-translator/build.gradle b/language-translator/build.gradle
@@ -25,7 +25,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
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.4.0</version>
+  <version>6.5.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:natural-language-classifier:6.4.0'
+'com.ibm.watson.developer_cloud:natural-language-classifier:6.5.0'
 ```
 
 ## Usage
diff --git a/natural-language-classifier/build.gradle b/natural-language-classifier/build.gradle
@@ -25,7 +25,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
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.4.0</version>
+  <version>6.5.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:natural-language-understanding:6.4.0'
+'com.ibm.watson.developer_cloud:natural-language-understanding:6.5.0'
 ```
 
 ## Usage
diff --git a/natural-language-understanding/build.gradle b/natural-language-understanding/build.gradle
@@ -25,7 +25,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
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.4.0</version>
+  <version>6.5.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:personality-insights:6.4.0'
+'com.ibm.watson.developer_cloud:personality-insights:6.5.0'
 ```
 
 ## Usage
diff --git a/personality-insights/build.gradle b/personality-insights/build.gradle
@@ -25,7 +25,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
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.4.0</version>
+  <version>6.5.0</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:speech-to-text:6.4.0'
+'com.ibm.watson.developer_cloud:speech-to-text:6.5.0'
 ```
 
 ## Usage
diff --git a/speech-to-text/build.gradle b/speech-to-text/build.gradle
@@ -25,7 +25,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 repositories {
-    mavenCentral()
+    maven { url = "http://repo.maven.apache.org/maven2" }
 }
 
 artifacts {
diff --git a/speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/RecognizeOptions.java b/speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/RecognizeOptions.java
diff --git a/speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/SpeechToTextWebSocketListener.java b/speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/SpeechToTextWebSocketListener.java
diff --git a/speech-to-text/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextTest.java b/speech-to-text/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextTest.java
diff --git a/text-to-speech/README.md b/text-to-speech/README.md
diff --git a/text-to-speech/build.gradle b/text-to-speech/build.gradle
diff --git a/tone-analyzer/README.md b/tone-analyzer/README.md
diff --git a/tone-analyzer/build.gradle b/tone-analyzer/build.gradle
diff --git a/tone-analyzer/src/test/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/ToneAnalyzerTest.java b/tone-analyzer/src/test/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/ToneAnalyzerTest.java
diff --git a/visual-recognition/README.md b/visual-recognition/README.md
diff --git a/visual-recognition/build.gradle b/visual-recognition/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ task sourcesJar(type: Jar) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`repositories {`
`28`		`- mavenCentral()`
	`28`	`+ maven { url = "http://repo.maven.apache.org/maven2" }`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`artifacts {`
Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,14 @@ allprojects {`
`51`	`51`	`targetCompatibility = JavaVersion.VERSION_1_7`
`52`	`52`
`53`	`53`	`repositories {`
`54`		`- mavenCentral()`
	`54`	`+ maven { url = "http://repo.maven.apache.org/maven2" }`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`subprojects {`
`59`	`59`
`60`	`60`	`dependencies {`
`61`		`- testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.8.0'`
	`61`	`+ testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.11.0'`
`62`	`62`	`testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'`
`63`	`63`	`testCompile group: 'com.google.guava', name: 'guava', version: '20.0'`
`64`	`64`	`testCompile group: 'junit', name: 'junit', version: '4.12'`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`repositories {`
`28`		`- mavenCentral()`
	`28`	`+ maven { url = "http://repo.maven.apache.org/maven2" }`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`artifacts {`
`@@ -69,9 +69,9 @@ checkstyle {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`dependencies {`
`72`		`- compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.8.0'`
`73`		`- compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '3.8.0'`
`74`		`- compile group: 'com.squareup.okhttp3', name: 'okhttp-urlconnection', version: '3.8.0'`
	`72`	`+ compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.11.0'`
	`73`	`+ compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '3.11.0'`
	`74`	`+ compile group: 'com.squareup.okhttp3', name: 'okhttp-urlconnection', version: '3.11.0'`
`75`	`75`	`compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'`
`76`	`76`	`compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'`
`77`	`77`	`compile group: 'org.glassfish.jersey.bundles.repackaged', name: 'jersey-jsr166e', version: '2.25.1'`