v3.7.2

.travis.yml

@@ -34,6 +34,8 @@ script:
   - ./gradlew test
   - ./gradlew codeCoverageReport
   - ./gradlew docs > /dev/null # build the javadoc
+  - ./gradlew checkstyleMain
+  - ./gradlew checkstyleTest
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,6 +1,19 @@
 Change Log
 ==========
 
+## Version 3.7.2
+
+_2017-04-07_
+
+  * New: Provide a specific document Id when creating a document			d581c3f
+  * New: NLU: Add model for disambiguation and property in EntitiesResults			8acb411
+  * New: Add test for disambiguation info			9328c5f
+  * Fix: Discovery: create or update a document from an InputStream and optionally spec…  …			ab2f413
+  * Fix: Add README.md for Natural Language Understanding			4e53c8f
+  * Fix: 👕 Checkstyle	Verified		a95c68d
+  * Fix: TTS Synthesize using POST, fixes #635 and #602	Verified		5ae0d24
+  * Fix: Language translator, update service name	Verified		37abc86
+
 ## Version 3.7.1
 
 _2017-03-31_

README.md

@@ -54,7 +54,7 @@ All the services:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>java-sdk</artifactId>
-	<version>3.7.1</version>
+	<version>3.7.2</version>
 </dependency>
 ```
 
@@ -63,25 +63,25 @@ Only Retrieve and Rank:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>retrieve-and-rank</artifactId>
-	<version>3.7.1</version>
+	<version>3.7.2</version>
 </dependency>
 ```
 
 ##### Gradle
 
 All the services:
 ```gradle
-'com.ibm.watson.developer_cloud:java-sdk:3.7.1'
+'com.ibm.watson.developer_cloud:java-sdk:3.7.2'
 ```
 
 Only Retrieve and Rank:
 ```gradle
-'com.ibm.watson.developer_cloud:retrieve-and-rank:3.7.1'
+'com.ibm.watson.developer_cloud:retrieve-and-rank:3.7.2'
 ```
 
 Only Visual Recognition:
 ```gradle
-'com.ibm.watson.developer_cloud:visual-recognition:3.7.1'
+'com.ibm.watson.developer_cloud:visual-recognition:3.7.2'
 ```
 
 Snapshots of the development version are available in [Sonatype's snapshots repository][sonatype_snapshots].
@@ -286,7 +286,7 @@ Gradle:
 
   ```sh
   $ cd java-sdk
-  $ gradle jar  # build jar file (build/libs/watson-developer-cloud-3.7.1.jar)
+  $ gradle jar  # build jar file (build/libs/watson-developer-cloud-3.7.2.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)
@@ -323,4 +323,4 @@ See [CONTRIBUTING.md](.github/CONTRIBUTING.md).
 [apache_maven]: http://maven.apache.org/
 [sonatype_snapshots]: https://oss.sonatype.org/content/repositories/snapshots/com/ibm/watson/developer_cloud/
 
-[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-3.7.1/java-sdk-3.7.1-jar-with-dependencies.jar
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-3.7.2/java-sdk-3.7.2-jar-with-dependencies.jar

alchemy/README.md

@@ -7,13 +7,13 @@
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>alchemy</artifactId>
-	<version>3.7.1</version>
+	<version>3.7.2</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:alchemy:3.7.1'
+'com.ibm.watson.developer_cloud:alchemy:3.7.2'
 ```
 
 ## Alchemy Language

alchemy/build.gradle

@@ -51,6 +51,7 @@ signArchives {
 
 checkstyle {
     configFile = rootProject.file('checkstyle.xml')
+    ignoreFailures = false
 }
 
 dependencies {

alchemy/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyLanguageIT.java

@@ -23,6 +23,7 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import com.ibm.watson.developer_cloud.WatsonServiceTest;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.CombinedResults;
@@ -45,10 +46,12 @@
 import com.ibm.watson.developer_cloud.alchemy.v1.model.TypedEntity;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.TypedRelation;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.TypedRelations;
+import com.ibm.watson.developer_cloud.util.RetryRunner;
 
 /**
  * Alchemy Language Integration tests.
  */
+@RunWith(RetryRunner.class)
 public class AlchemyLanguageIT extends WatsonServiceTest {
 
   private static final String testURL =

alchemy/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVisionIT.java

@@ -19,6 +19,7 @@
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import com.ibm.watson.developer_cloud.WatsonServiceTest;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageFaces;
@@ -28,12 +29,14 @@
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageSceneText;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageSceneTextLine;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageSceneTextLine.Word;
+import com.ibm.watson.developer_cloud.util.RetryRunner;
 
 import okhttp3.HttpUrl;
 
 /**
  * The Class AlchemyVisionTest.
  */
+@RunWith(RetryRunner.class)
 public class AlchemyVisionIT extends WatsonServiceTest {
 
   private static final String IMAGE_OBAMA = "src/test/resources/alchemy/obama.jpg";

build.gradle

@@ -17,6 +17,19 @@ javadoc {
   source = 'src/main/java'
 }
 
+checkstyle {
+  ignoreFailures = false
+}
+
+checkstyleMain {
+  ignoreFailures = false
+}
+
+checkstyleTest {
+  ignoreFailures = false
+}
+
+
 task docs(type: Javadoc) {
   destinationDir = file("$buildDir/docs/all")
 }
@@ -45,8 +58,12 @@ allprojects {
 
 subprojects {
 
+  checkstyleMain {
+    ignoreFailures = false
+  }
+
   checkstyleTest {
-    ignoreFailures = true
+    ignoreFailures = false
   }
 
   afterEvaluate {

conversation/README.md

@@ -7,13 +7,13 @@
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>conversation</artifactId>
-	<version>3.7.1</version>
+	<version>3.7.2</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:conversation:3.7.1'
+'com.ibm.watson.developer_cloud:conversation:3.7.2'
 ```
 
 ## Usage

conversation/build.gradle

@@ -51,6 +51,7 @@ signArchives {
 
 checkstyle {
     configFile = rootProject.file('checkstyle.xml')
+    ignoreFailures = false
 }
 
 dependencies {

conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationServiceIT.java

@@ -19,15 +19,18 @@
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import com.ibm.watson.developer_cloud.WatsonServiceTest;
 import com.ibm.watson.developer_cloud.conversation.v1.model.Intent;
 import com.ibm.watson.developer_cloud.conversation.v1.model.MessageRequest;
 import com.ibm.watson.developer_cloud.conversation.v1.model.MessageResponse;
+import com.ibm.watson.developer_cloud.util.RetryRunner;
 
 /**
  * Integration test for the {@link ConversationService}.
  */
+@RunWith(RetryRunner.class)
 public class ConversationServiceIT extends WatsonServiceTest {
 
   private ConversationService service;

core/build.gradle

@@ -49,13 +49,10 @@ signArchives {
     }
 }
 
-checkstyleTest {
-    ignoreFailures = true
-}
 
 checkstyle {
     configFile = rootProject.file('checkstyle.xml')
-    ignoreFailures = true
+    ignoreFailures = false
 }
 
   task testJar(type: Jar) {

core/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java

@@ -134,7 +134,7 @@ protected OkHttpClient configureHttpClient() {
         .build();
 
     builder.connectionSpecs(Arrays.asList(spec, ConnectionSpec.CLEARTEXT));
-    
+
     return builder.build();
   }
 

core/src/test/java/com/ibm/watson/developer_cloud/util/RetryRunner.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2017 IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.watson.developer_cloud.util;
+
+import java.util.logging.Logger;
+
+import org.junit.Ignore;
+import org.junit.internal.AssumptionViolatedException;
+import org.junit.internal.runners.model.EachTestNotifier;
+import org.junit.runner.Description;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runner.notification.StoppedByUserException;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+/**
+ * Junit Runner that retry tests. Useful when tests could fail due to network issues.
+ */
+public class RetryRunner extends BlockJUnit4ClassRunner {
+  private static final Logger LOG = Logger.getLogger(RetryRunner.class.getName());
+
+  private static final int RETRY_COUNT = 2;
+
+  /**
+   * Instantiates a new retry runner.
+   *
+   * @param clazz the class
+   * @throws InitializationError the initialization error
+   */
+  public RetryRunner(Class<?> clazz) throws InitializationError {
+    super(clazz);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.junit.runners.ParentRunner#run(org.junit.runner.notification.RunNotifier)
+   */
+  @Override
+  public void run(final RunNotifier notifier) {
+    EachTestNotifier testNotifier = new EachTestNotifier(notifier, getDescription());
+    Statement statement = classBlock(notifier);
+    try {
+      statement.evaluate();
+    } catch (AssumptionViolatedException ave) {
+      testNotifier.fireTestIgnored();
+    } catch (StoppedByUserException sbue) {
+      throw sbue;
+    } catch (Throwable t) {
+      LOG.warning("Retry class: " + getDescription().getDisplayName());
+      retry(testNotifier, statement, t, getDescription());
+    }
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.junit.runners.BlockJUnit4ClassRunner#runChild(org.junit.runners.model.FrameworkMethod,
+   * org.junit.runner.notification.RunNotifier)
+   */
+  @Override
+  protected void runChild(final FrameworkMethod method, RunNotifier notifier) {
+    Description description = describeChild(method);
+    if (method.getAnnotation(Ignore.class) != null) {
+      notifier.fireTestIgnored(description);
+    } else {
+      runTest(methodBlock(method), description, notifier);
+    }
+  }
+
+  private void runTest(Statement statement, Description description, RunNotifier notifier) {
+    EachTestNotifier eachNotifier = new EachTestNotifier(notifier, description);
+    eachNotifier.fireTestStarted();
+    try {
+      statement.evaluate();
+    } catch (AssumptionViolatedException e) {
+      eachNotifier.addFailedAssumption(e);
+    } catch (Throwable e) {
+      LOG.warning("Retry test: " + description.getDisplayName());
+      retry(eachNotifier, statement, e, description);
+    } finally {
+      eachNotifier.fireTestFinished();
+    }
+  }
+
+  private void retry(EachTestNotifier notifier, Statement statement, Throwable currentThrowable, Description info) {
+    int failedAttempts = 0;
+    Throwable caughtThrowable = currentThrowable;
+    while (RETRY_COUNT > failedAttempts) {
+      try {
+        LOG.warning("Retry attempt " + (failedAttempts + 1) + " for " + info.getDisplayName());
+        statement.evaluate();
+        return;
+      } catch (Throwable t) {
+        failedAttempts++;
+        caughtThrowable = t;
+      }
+    }
+    notifier.addFailure(caughtThrowable);
+  }
+}

core/src/test/java/com/ibm/watson/developer_cloud/util/WaitFor.java

@@ -21,7 +21,9 @@
 
 public class WaitFor {
 
-  private WaitFor() {}
+  private WaitFor() {
+
+  }
 
   /**
    * Static method used to wait for a specific condition to be satisfied.

dialog/build.gradle

@@ -49,11 +49,9 @@ signArchives {
     }
 }
 
-checkstyleTest {
-    ignoreFailures = true
-}
 checkstyle {
     configFile = rootProject.file('checkstyle.xml')
+    ignoreFailures = false
 }
 
 task testJar(type: Jar) {