From c464f18caae00c8f9393e6c919b0669ec7f0d17b Mon Sep 17 00:00:00 2001
From: Garrett May <g-may@users.noreply.github.com>
Date: Wed, 27 Jan 2016 11:20:54 -0500
Subject: [PATCH 01/29] fix typo in IDHelper (accoundId --> accountId)

---
 .../concept_insights/v2/util/IDHelper.java           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/util/IDHelper.java b/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/util/IDHelper.java
index 784aa4bcbf2..989839a9963 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/util/IDHelper.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/util/IDHelper.java
@@ -72,10 +72,10 @@ public static String getConceptId(final Concept concept) {
    * generated it.
    * 
    * @param corpus Corpus the corpus object,
-   * @param accoundId String the account id.
+   * @param accountId String the account id.
    * @return the corpus id
    */
-  public static String getCorpusId(final Corpus corpus, final String accoundId) {
+  public static String getCorpusId(final Corpus corpus, final String accountId) {
     Validate.notNull(corpus, "corpus cannot be null");
     if (corpus.getId() != null) {
       validate(CORPUS_ID_REGEX, corpus.getId(), "Provide a valid corpus.id (format is " + '"'
@@ -83,7 +83,7 @@ public static String getCorpusId(final Corpus corpus, final String accoundId) {
       return corpus.getId();
     } else {
       Validate.notNull(corpus.getName(), "corpus.name cannot be null");
-      return "/corpora/" + accoundId + "/" + corpus.getName();
+      return "/corpora/" + accountId + "/" + corpus.getName();
     }
   }
 
@@ -107,10 +107,10 @@ public static String getDocumentId(final Document document) {
    * generated it.
    * 
    * @param graph Graph the graph object,
-   * @param accoundId String the account id.
+   * @param accountId String the account id.
    * @return the graph id
    */
-  public static String getGraphId(final Graph graph, final String accoundId) {
+  public static String getGraphId(final Graph graph, final String accountId) {
     Validate.notNull(graph, "graph object cannot be null");
     if (graph.getId() != null) {
       validate(GRAPH_ID_REGEX, graph.getId(), "Provide a valid graph.id (format is " + '"'
@@ -118,7 +118,7 @@ public static String getGraphId(final Graph graph, final String accoundId) {
       return graph.getId();
     } else {
       Validate.notNull(graph.getName(), "graph.name cannot be null");
-      return "/graphs/" + accoundId + "/" + graph.getName();
+      return "/graphs/" + accountId + "/" + graph.getName();
     }
   }
 

From d237d926ee0c70d506fc6a494ff5278350e8d337 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 2 Feb 2016 08:40:44 -0500
Subject: [PATCH 02/29] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 603f8b8d6d4..debb1045013 100644
--- a/README.md
+++ b/README.md
@@ -459,7 +459,7 @@ System.out.println(recognizedImage);
 ```
 
 ## Android
-he library supports Android 2.3 and above. For Java, the minimum requirement is 1.7.  
+The library supports Android 2.3 and above. For Java, the minimum requirement is 1.7.  
 It depends on [OkHttp][] and [gson][].
 
 

From 0dc3bbce8f0f861b2070c63b0e1ccfec2c7b6129 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Mon, 8 Feb 2016 22:36:40 -0500
Subject: [PATCH 03/29] Updated websocket dependency

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 12ae8defbba..24923451694 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>com.neovisionaries</groupId>
 			<artifactId>nv-websocket-client</artifactId>
-			<version>1.19</version>
+			<version>1.21</version>
 		</dependency>
 		<!-- mockserver -->
 		<dependency>

From 1893993a387319847fd9f76ba2401c4d3fdf83a4 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Mon, 8 Feb 2016 22:37:22 -0500
Subject: [PATCH 04/29] Get the http string from the http InputStream

---
 .../service/WatsonService.java                |  2 +-
 .../developer_cloud/util/ResponseUtil.java    | 29 +++++++------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java b/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
index 2a66a497915..2f31c03d8de 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
@@ -248,7 +248,7 @@ public String getToken() {
    * @return the error message from the JSON object
    */
   private String getErrorMessage(Response response) {
-    String error = ResponseUtil.getResponseString(response);
+    String error = ResponseUtil.getString(response);
     try {
 
       final JsonObject jsonObject = ResponseUtil.getJsonObject(error);
diff --git a/src/main/java/com/ibm/watson/developer_cloud/util/ResponseUtil.java b/src/main/java/com/ibm/watson/developer_cloud/util/ResponseUtil.java
index 39dfab787ab..36298bec68b 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/util/ResponseUtil.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/util/ResponseUtil.java
@@ -21,6 +21,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.google.gson.stream.JsonReader;
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 import com.squareup.okhttp.Response;
 
@@ -52,21 +53,6 @@ public static InputStream getInputStream(Response response) {
     }
   }
 
-  /**
-   * Returns the HTTP Response as a {@link String}.
-   * 
-   * @param response an HTTP response
-   * @return the content body as String
-   */
-  public static String getResponseString(Response response) {
-    try {
-      return response.body().string();
-    } catch (final IOException e) {
-      log.log(Level.SEVERE, ERROR_MESSAGE, e);
-      throw new RuntimeException(ERROR_MESSAGE, e);
-    }
-  }
-
   /**
    * Return a {@link JsonElement} representation of the response.
    * 
@@ -111,11 +97,18 @@ public static JsonObject getJsonObject(String jsonString) {
    * @return the POJO
    */
   public static <T extends GenericModel> T getObject(Response response, Class<T> type) {
-    final String jsonString = getString(response);
-    final T model = GsonSingleton.getGson().fromJson(jsonString, type);
-    return model;
+    JsonReader reader;
+    try {
+      reader = new JsonReader(response.body().charStream());
+      final T model = GsonSingleton.getGson().fromJson(reader, type);
+      return model;
+    } catch (IOException e) {
+      log.log(Level.SEVERE, ERROR_MESSAGE, e);
+      throw new RuntimeException(ERROR_MESSAGE, e);
+    }
   }
 
+
   /**
    * Returns a String representation of the response.
    * 

From 6e84e5aaad3c295ee33d5b39ebba0fbd4384daf3 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Mon, 8 Feb 2016 22:39:59 -0500
Subject: [PATCH 05/29] Fixed #171 wrong query parameter

---
 .../language_translation/v2/LanguageTranslation.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
index 0e82533d077..fb6712f5568 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
@@ -68,8 +68,8 @@ public class LanguageTranslation extends WatsonService {
   /** The Constant NAME (value is "name"). */
   private static final String NAME = "name";
 
-  /** The Constant PARALLEL_CORPUS (value is "prallel_corpus"). */
-  private static final String PARALLEL_CORPUS = "prallel_corpus";
+  /** The Constant PARALLEL_CORPUS (value is "parallel_corpus"). */
+  private static final String PARALLEL_CORPUS = "parallel_corpus";
 
   /** The Constant SOURCE (value is "source"). */
   private static final String SOURCE = "source";

From 05b1f69c78ec7ce2a8ec12e19e8b09f52764bc65 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Mon, 8 Feb 2016 22:48:23 -0500
Subject: [PATCH 06/29] [concept-insights] Add expires_on and ttl_hours fields
 to the corpus object #168

---
 .../concept_insights/v2/model/Corpus.java     | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/model/Corpus.java b/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/model/Corpus.java
index 1cf0e095516..bda9baf32fc 100755
--- a/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/model/Corpus.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/model/Corpus.java
@@ -48,6 +48,56 @@ public class Corpus extends GenericModel {
   /** The corpus name. */
   private String name;
 
+  @SerializedName("ttl_hours")
+  private Integer ttlInHours;
+  // ttl_hours (integer, optional): Specify the TTL for the corpus in hours. This will internally
+  // set the expiration time after which the corpus will be automatically deleted. ,
+  // expires_on (string, optional): Date and time in standard ISO format at which the corpus will
+  // expire and be marked for deletion.
+
+  @SerializedName("expires_on")
+  private String expiresOn;
+
+  /**
+   * Gets the time to live in hours.
+   *
+   * @return the time to live in hours
+   */
+  public Integer getTtlInHours() {
+    return ttlInHours;
+  }
+
+  /**
+   * Sets the time to live in hours. This will internally set the expiration time after which the
+   * corpus will be automatically deleted.
+   * 
+   * @param ttlInHours the new time to live in hours
+   */
+  public void setTtlInHours(Integer ttlInHours) {
+    this.ttlInHours = ttlInHours;
+  }
+
+  /**
+   * Gets the expires on.
+   *
+   * @return the expires on
+   */
+  public String getExpiresOn() {
+    return expiresOn;
+  }
+
+  /**
+   * Sets the expires on. The value needs to be in standard ISO format at which the corpus will
+   * expire and be marked for deletion.
+   *
+   * For example: YYYY-MM-DD (e.g. 2016-07-16)
+   * 
+   * @param expiresOn the new expires on
+   */
+  public void setExpiresOn(String expiresOn) {
+    this.expiresOn = expiresOn;
+  }
+
   /**
    * Instantiates a new corpus.
    */

From 94171770d14014e07fe6f24a12d0c7a45256f111 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Mon, 8 Feb 2016 22:57:20 -0500
Subject: [PATCH 07/29] Added X-Watson-Learning-Opt-Out to prevent payload from
 being use to improve Watson. Specially since this are integration tests

---
 .../com/ibm/watson/developer_cloud/http/HttpHeaders.java  | 4 ++++
 .../com/ibm/watson/developer_cloud/WatsonServiceTest.java | 8 ++++++++
 .../developer_cloud/alchemy/v1/AlchemyDataNewsIT.java     | 2 +-
 .../developer_cloud/alchemy/v1/AlchemyLanguageIT.java     | 1 +
 .../developer_cloud/alchemy/v1/AlchemyVisionIT.java       | 1 +
 .../concept_expansion/v1/ConceptExpansionIT.java          | 1 +
 .../concept_insights/v2/ConceptInsightsIT.java            | 1 +
 .../watson/developer_cloud/dialog/v1/DialogServiceIT.java | 2 +-
 .../document_conversion/v1/DocumentConversionIT.java      | 2 +-
 .../language_translation/v2/LanguageTranslationIT.java    | 1 +
 .../v1/NaturalLanguageClassifierIT.java                   | 1 +
 .../personality_insights/v2/PersonalityInsightsIT.java    | 1 +
 .../v1/RelationshipExtractionIT.java                      | 1 +
 .../retrieve_and_rank/v1/RetrieveAndRankIT.java           | 1 +
 .../developer_cloud/speech_to_text/v1/SpeechToTextIT.java | 1 +
 .../developer_cloud/text_to_speech/v1/TextToSpeechIT.java | 1 +
 .../developer_cloud/tone_analyzer/v1/ToneAnalyzerIT.java  | 1 +
 .../tradeoff_analytics/v1/TradeoffAnalyticsIT.java        | 2 +-
 .../visual_insights/v1/VisualInsightsIT.java              | 1 +
 .../visual_recognition/v2/VisualRecognitionIT.java        | 1 +
 20 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/http/HttpHeaders.java b/src/main/java/com/ibm/watson/developer_cloud/http/HttpHeaders.java
index 63db918e4e2..6ce0e7c0bde 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/http/HttpHeaders.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/http/HttpHeaders.java
@@ -181,4 +181,8 @@ public interface HttpHeaders {
 
   /** The Authorization token header. */
   public static final String X_WATSON_AUTHORIZATION_TOKEN = "X-Watson-Authorization-Token";
+
+  /** Allow Watson to collect the payload. */
+  public static final String X_WATSON_LEARNING_OPT_OUT = "X-Watson-Learning-Opt-Out";
+  
 }
diff --git a/src/test/java/com/ibm/watson/developer_cloud/WatsonServiceTest.java b/src/test/java/com/ibm/watson/developer_cloud/WatsonServiceTest.java
index 99d04f05122..7d20687dee4 100755
--- a/src/test/java/com/ibm/watson/developer_cloud/WatsonServiceTest.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/WatsonServiceTest.java
@@ -24,12 +24,15 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.slf4j.LoggerFactory;
 
+import com.ibm.watson.developer_cloud.http.HttpHeaders;
 import com.ibm.watson.developer_cloud.util.GsonSingleton;
 
 /**
@@ -49,6 +52,11 @@ public WatsonServiceTest() {
     setupLogging();
   }
 
+  protected Map<String,String> getDefaultHeaders() {
+    Map<String,String> headers = new HashMap<String,String>();
+    headers.put(HttpHeaders.X_WATSON_LEARNING_OPT_OUT, String.valueOf(true));
+    return headers;
+  }
   /**
    * The Class EmptyPropertyException.
    */
diff --git a/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyDataNewsIT.java b/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyDataNewsIT.java
index ec8e8444807..c6c47893794 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyDataNewsIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyDataNewsIT.java
@@ -43,7 +43,7 @@ public void setUp() throws Exception {
     super.setUp();
     service = new AlchemyDataNews();
     service.setApiKey(getValidProperty("alchemy.alchemy"));
-
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   /**
diff --git a/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyLanguageIT.java b/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyLanguageIT.java
index 8ddbbac3537..2415fc27fd8 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyLanguageIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyLanguageIT.java
@@ -60,6 +60,7 @@ public void setUp() throws Exception {
     super.setUp();
     service = new AlchemyLanguage();
     service.setApiKey(getValidProperty("alchemy.alchemy"));
+    service.setDefaultHeaders(getDefaultHeaders());
     htmlExample =
         getStringFromInputStream(new FileInputStream("src/test/resources/alchemy/example.html"));
 
diff --git a/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVisionIT.java b/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVisionIT.java
index 529619b475e..d3d5b1ab73c 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVisionIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVisionIT.java
@@ -52,6 +52,7 @@ public void setUp() throws Exception {
     super.setUp();
     service = new AlchemyVision();
     service.setApiKey(getValidProperty("alchemy.alchemy"));
+    service.setDefaultHeaders(getDefaultHeaders());
     htmlExample =
         getStringFromInputStream(new FileInputStream("src/test/resources/alchemy/example.html"));
   }
diff --git a/src/test/java/com/ibm/watson/developer_cloud/concept_expansion/v1/ConceptExpansionIT.java b/src/test/java/com/ibm/watson/developer_cloud/concept_expansion/v1/ConceptExpansionIT.java
index d0025c174a6..b0f43b9c691 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/concept_expansion/v1/ConceptExpansionIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/concept_expansion/v1/ConceptExpansionIT.java
@@ -42,6 +42,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("concept_expansion.username"),
         getValidProperty("concept_expansion.password"));
     service.setEndPoint(getValidProperty("concept_expansion.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   /**
diff --git a/src/test/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsightsIT.java b/src/test/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsightsIT.java
index 7a64e579fe6..6b5df3e53ad 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsightsIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsightsIT.java
@@ -76,6 +76,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("concept_insights.username"),
         getValidProperty("concept_insights.password"));
     service.setEndPoint(getValidProperty("concept_insights.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   /**
diff --git a/src/test/java/com/ibm/watson/developer_cloud/dialog/v1/DialogServiceIT.java b/src/test/java/com/ibm/watson/developer_cloud/dialog/v1/DialogServiceIT.java
index 0cdf76e6a10..4c47f8d5503 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/dialog/v1/DialogServiceIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/dialog/v1/DialogServiceIT.java
@@ -59,7 +59,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("dialog.username"),
         getValidProperty("dialog.password"));
     service.setEndPoint(getValidProperty("dialog.url"));
-
+    service.setDefaultHeaders(getDefaultHeaders());
     dialogId = getValidProperty("dialog.dialog_id");
   }
 
diff --git a/src/test/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversionIT.java b/src/test/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversionIT.java
index 0a05cfcb1cf..aa4c5af9036 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversionIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversionIT.java
@@ -44,7 +44,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(prop.getProperty("document_conversion.username"),
         prop.getProperty("document_conversion.password"));
     service.setEndPoint(prop.getProperty("document_conversion.url"));
-
+    service.setDefaultHeaders(getDefaultHeaders());
     files =
         new File[] {
             new File("src/test/resources/document_conversion/word-docx-heading-input.docx"),
diff --git a/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java b/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java
index 7c70218fe4b..da5c18d17e4 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java
@@ -58,6 +58,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("language_translation.username"),
         getValidProperty("language_translation.password"));
     service.setEndPoint(getValidProperty("language_translation.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   /**
diff --git a/src/test/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/NaturalLanguageClassifierIT.java b/src/test/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/NaturalLanguageClassifierIT.java
index ca1a6c31d1b..62939ce108a 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/NaturalLanguageClassifierIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/NaturalLanguageClassifierIT.java
@@ -91,6 +91,7 @@ public void testClassify() throws Exception {
   public void setUp() throws Exception {
     super.setUp();
     service = new NaturalLanguageClassifier();
+    service.setDefaultHeaders(getDefaultHeaders());
     service.setUsernameAndPassword(getValidProperty("natural_language_classifier.username"),
         getValidProperty("natural_language_classifier.password"));
     service.setEndPoint(getValidProperty("natural_language_classifier.url"));
diff --git a/src/test/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsightsIT.java b/src/test/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsightsIT.java
index 8a61a81f6e5..2f9487b8fb5 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsightsIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsightsIT.java
@@ -48,6 +48,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("personality_insights.username"),
         getValidProperty("personality_insights.password"));
     service.setEndPoint(getValidProperty("personality_insights.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   @Test
diff --git a/src/test/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtractionIT.java b/src/test/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtractionIT.java
index c269f9f8cdf..ef0f9f12d3a 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtractionIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtractionIT.java
@@ -45,6 +45,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("relationship_extraction.username"),
         getValidProperty("relationship_extraction.password"));
     service.setEndPoint(getValidProperty("relationship_extraction.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   /**
diff --git a/src/test/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankIT.java b/src/test/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankIT.java
index 939765a08b3..9e1efc9e140 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankIT.java
@@ -63,6 +63,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("retrieve_and_rank.username"),
         getValidProperty("retrieve_and_rank.password"));
     service.setEndPoint(getValidProperty("retrieve_and_rank.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
     rankerId = getValidProperty("retrieve_and_rank.ranker_id");
     clusterId = getValidProperty("retrieve_and_rank.cluster_id");
   }
diff --git a/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextIT.java b/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextIT.java
index 3fbae1f5c25..beb92da0120 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextIT.java
@@ -59,6 +59,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("speech_to_text.username"),
         getValidProperty("speech_to_text.password"));
     service.setEndPoint(getValidProperty("speech_to_text.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   /**
diff --git a/src/test/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeechIT.java b/src/test/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeechIT.java
index 7b2861ecbb2..4ea176106b6 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeechIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeechIT.java
@@ -64,6 +64,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(prop.getProperty("text_to_speech.username"),
         prop.getProperty("text_to_speech.password"));
     service.setEndPoint(prop.getProperty("text_to_speech.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
 
diff --git a/src/test/java/com/ibm/watson/developer_cloud/tone_analyzer/v1/ToneAnalyzerIT.java b/src/test/java/com/ibm/watson/developer_cloud/tone_analyzer/v1/ToneAnalyzerIT.java
index 3d204a91ba0..35792d7ae2d 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/tone_analyzer/v1/ToneAnalyzerIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/tone_analyzer/v1/ToneAnalyzerIT.java
@@ -46,6 +46,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("tone_analyzer.username"),
         getValidProperty("tone_analyzer.password"));
     service.setEndPoint(getValidProperty("tone_analyzer.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
 
   }
 
diff --git a/src/test/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalyticsIT.java b/src/test/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalyticsIT.java
index 30280e91892..f9695f67d01 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalyticsIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalyticsIT.java
@@ -54,7 +54,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("tradeoff_analytics.username"),
         getValidProperty("tradeoff_analytics.password"));
     service.setEndPoint(getValidProperty("tradeoff_analytics.url"));
-
+    service.setDefaultHeaders(getDefaultHeaders());
     problem = loadFixture("src/test/resources/tradeoff_analytics/problem.json", Problem.class);
   }
 
diff --git a/src/test/java/com/ibm/watson/developer_cloud/visual_insights/v1/VisualInsightsIT.java b/src/test/java/com/ibm/watson/developer_cloud/visual_insights/v1/VisualInsightsIT.java
index 81a1be7a540..fd8e257c783 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/visual_insights/v1/VisualInsightsIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/visual_insights/v1/VisualInsightsIT.java
@@ -52,6 +52,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("visual_insights.username"),
         getValidProperty("visual_insights.password"));
     service.setEndPoint(getValidProperty("visual_insights.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   /**
diff --git a/src/test/java/com/ibm/watson/developer_cloud/visual_recognition/v2/VisualRecognitionIT.java b/src/test/java/com/ibm/watson/developer_cloud/visual_recognition/v2/VisualRecognitionIT.java
index ba18a90bb40..b1ebc0e971f 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/visual_recognition/v2/VisualRecognitionIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/visual_recognition/v2/VisualRecognitionIT.java
@@ -49,6 +49,7 @@ public void setUp() throws Exception {
     service.setUsernameAndPassword(getValidProperty("visual_recognition.v2.username"),
         getValidProperty("visual_recognition.v2.password"));
     service.setEndPoint(getValidProperty("visual_recognition.v2.url"));
+    service.setDefaultHeaders(getDefaultHeaders());
   }
 
   /**

From 43e5e5150e9444007255290c9b1229967899c927 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Mon, 8 Feb 2016 23:18:50 -0500
Subject: [PATCH 08/29] [language-translation] Allow more than one file to be
 used when creating a model, fix #172

---
 .../language_translation/v2/LanguageTranslation.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
index fb6712f5568..3c9553eda36 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
@@ -112,10 +112,10 @@ public TranslationModel createModel(CreateModelOptions options) {
     if (options.getForcedGlossary() != null)
       bodyBuilder.addFormDataPart(FORCED_GLOSSARY, options.getForcedGlossary().getName(),
           RequestBody.create(HttpMediaType.BINARY_FILE, options.getForcedGlossary()));
-    else if (options.getMonolingualCorpus() != null)
+    if (options.getMonolingualCorpus() != null)
       bodyBuilder.addFormDataPart(MONOLINGUAL_CORPUS, options.getMonolingualCorpus().getName(),
           RequestBody.create(HttpMediaType.BINARY_FILE, options.getMonolingualCorpus()));
-    else if (options.getParallelCorpus() != null)
+    if (options.getParallelCorpus() != null)
       bodyBuilder.addFormDataPart(PARALLEL_CORPUS, options.getParallelCorpus().getName(),
           RequestBody.create(HttpMediaType.BINARY_FILE, options.getParallelCorpus()));
 

From 140bfa4dc78ab06f825c3f83187f69bb4b45467d Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Mon, 8 Feb 2016 23:20:11 -0500
Subject: [PATCH 09/29] Fix for java.naming.InitialContext that was preventing
 android users from using the sdks #167

---
 .../developer_cloud/util/CredentialUtils.java | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/util/CredentialUtils.java b/src/main/java/com/ibm/watson/developer_cloud/util/CredentialUtils.java
index 1fb653d31e1..7457bb2bd73 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/util/CredentialUtils.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/util/CredentialUtils.java
@@ -117,20 +117,27 @@ public static String getAPIKey(String serviceName, String plan) {
 
   /**
    * Attempt to get the Base64-encoded API key through JNDI
+   * 
    * @param serviceName Name of the bluemix service
    * @return The encoded API Key
    */
-  private static String getKeyUsingJNDI(String serviceName){
-    try{
-      Context context = new InitialContext();
-      String lookupName = "watson-developer-cloud/" + serviceName + "/credentials";
-      String apiKey = (String) context.lookup(lookupName);
-      return apiKey;
-    }catch(NamingException e){
-      //ignore
-      return null;
+  private static String getKeyUsingJNDI(String serviceName) {
+    try {
+      Class.forName("javax.naming.Context");
+      try {
+        Context context = new InitialContext();
+        String lookupName = "watson-developer-cloud/" + serviceName + "/credentials";
+        String apiKey = (String) context.lookup(lookupName);
+        return apiKey;
+      } catch (NamingException e) {
+        return null;
+      }
+    } catch (ClassNotFoundException exception) {
+      log.info("JNDI string lookups is not available.");
     }
+    return null;
   }
+
   /**
    * Gets the <b>VCAP_SERVICES</b> environment variable and return it as a {@link JsonObject}.
    * 

From f43770cf7a2edbff041f333002f9ae0609c54d25 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 00:18:02 -0500
Subject: [PATCH 10/29] Updated authorizations keys in travis

---
 .travis.yml           |   3 +--
 config.properties.enc | Bin 3616 -> 3648 bytes
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ce050d76918..7105be3b071 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,8 @@ cache:
   directories:
   - $HOME/.m2/repository
 before_install:
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_a973fe4f8e79_key -iv $encrypted_a973fe4f8e79_iv -in config.properties.enc -out src/test/resources/config.properties -d || true'
 - pip install --user codecov
-- openssl aes-256-cbc -K $encrypted_a973fe4f8e79_key -iv $encrypted_a973fe4f8e79_iv
-  -in config.properties.enc -out src/test/resources/config.properties -d
 notifications:
   email: false
 env:
diff --git a/config.properties.enc b/config.properties.enc
index fde13015d00c3623ccd70ad311bff6a3b84e1025..2446665679ed27c5203265b73ed65747b9840edb 100644
GIT binary patch
literal 3648
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
S7ji{@q;CCer}Ud{cXHkL^AxuL

literal 3616
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


From a75fab5530916dffdfee6c6a581a35dccd94fff0 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 00:19:09 -0500
Subject: [PATCH 11/29] [dialog] Deprecate the old method in favor of #177

---
 .../com/ibm/watson/developer_cloud/dialog/v1/DialogService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/dialog/v1/DialogService.java b/src/main/java/com/ibm/watson/developer_cloud/dialog/v1/DialogService.java
index 1abb8246d15..313c5c3e3bf 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/dialog/v1/DialogService.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/dialog/v1/DialogService.java
@@ -148,6 +148,7 @@ public Conversation converse(final Conversation conversation, String newMessage)
    * 
    * @param params the params
    * @return the {@link Conversation} with the response
+   * @deprecated Use {@link DialogService#converse(Conversation, String)}
    */
   public Conversation converse(final Map<String, Object> params) {
 

From e5fce41090d22fff52a485d1043ddd63e599914e Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 00:19:56 -0500
Subject: [PATCH 12/29] Close the input stream for JSON HTTP responses after we
 read the json.

---
 .../com/ibm/watson/developer_cloud/util/ResponseUtil.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/util/ResponseUtil.java b/src/main/java/com/ibm/watson/developer_cloud/util/ResponseUtil.java
index 36298bec68b..2f509e5b477 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/util/ResponseUtil.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/util/ResponseUtil.java
@@ -105,6 +105,12 @@ public static <T extends GenericModel> T getObject(Response response, Class<T> t
     } catch (IOException e) {
       log.log(Level.SEVERE, ERROR_MESSAGE, e);
       throw new RuntimeException(ERROR_MESSAGE, e);
+    } finally {
+      try {
+        response.body().close();
+      } catch (IOException e) {
+        log.log(Level.SEVERE,"Error closing the HTTP Response", e);
+      }
     }
   }
 

From bbb6e9a17009933bf3145a1995405b058249d408 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 00:20:37 -0500
Subject: [PATCH 13/29] [language-translation] Sleep for 3 seconds after
 creating a model to be able to delete it without a 404 in the integration
 tests

---
 .../language_translation/v2/LanguageTranslation.java      | 8 +++++---
 .../language_translation/v2/LanguageTranslationIT.java    | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
index 3c9553eda36..93a65803ae4 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
@@ -208,9 +208,11 @@ public List<TranslationModel> getModels(final Boolean showDefault, final String
    */
   @SuppressWarnings("unchecked")
   public List<IdentifiedLanguage> identify(final String text) {
-    final Request request =
-        RequestBuilder.post(PATH_IDENTIFY).withBodyContent(text, HttpMediaType.TEXT_PLAIN)
-            .withHeader(HttpHeaders.ACCEPT, HttpMediaType.APPLICATION_JSON).build();
+    final Request request = RequestBuilder
+        .post(PATH_IDENTIFY)
+        .withHeader(HttpHeaders.ACCEPT, HttpMediaType.APPLICATION_JSON)
+        .withBodyContent(text, HttpMediaType.TEXT_PLAIN)
+        .build();
 
     final LanguageList languages = executeRequest(request, LanguageList.class);
 
diff --git a/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java b/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java
index da5c18d17e4..0a4e2b90a46 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java
@@ -72,7 +72,10 @@ public void testCreateAndDeleteModel() {
     TranslationModel model = null;
     try {
       model = service.createModel(options);
+      Thread.sleep(3000);
       assertNotNull(model);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
     } finally {
       if (model != null)
         service.deleteModel(model.getId());

From 137131d8bb7ed3885884fdcc3696fd6c4ece5d17 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 09:11:27 -0500
Subject: [PATCH 14/29] Fix default headers replacing existing headers in
 WatsonService

---
 .../v2/LanguageTranslation.java                   | 15 +++++++--------
 .../developer_cloud/service/WatsonService.java    |  3 ++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
index 93a65803ae4..cb34184350e 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java
@@ -39,8 +39,8 @@
  * identifies the language in which text is written.
  * 
  * @version v2
- * @see <a
- *      href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/language-translation.html">
+ * @see <a href=
+ *      "http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/language-translation.html">
  *      Language Translation</a>
  */
 public class LanguageTranslation extends WatsonService {
@@ -208,11 +208,9 @@ public List<TranslationModel> getModels(final Boolean showDefault, final String
    */
   @SuppressWarnings("unchecked")
   public List<IdentifiedLanguage> identify(final String text) {
-    final Request request = RequestBuilder
-        .post(PATH_IDENTIFY)
+    final Request request = RequestBuilder.post(PATH_IDENTIFY)
         .withHeader(HttpHeaders.ACCEPT, HttpMediaType.APPLICATION_JSON)
-        .withBodyContent(text, HttpMediaType.TEXT_PLAIN)
-        .build();
+        .withBodyContent(text, HttpMediaType.TEXT_PLAIN).build();
 
     final LanguageList languages = executeRequest(request, LanguageList.class);
 
@@ -278,8 +276,9 @@ private TranslationResult translateRequest(String text, String modelId, String s
     paragraphs.add(new JsonPrimitive(text));
     contentJson.add(TEXT, paragraphs);
 
-    final RequestBuilder requestBuilder = RequestBuilder.post(PATH_TRANSLATE);
-
+    final RequestBuilder requestBuilder = RequestBuilder.post(PATH_TRANSLATE)
+        .withHeader(HttpHeaders.ACCEPT, HttpMediaType.APPLICATION_JSON);
+    
     if (source != null && !source.isEmpty())
       contentJson.addProperty(SOURCE, source);
 
diff --git a/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java b/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
index 2f31c03d8de..6a4c5a3595b 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
@@ -105,7 +105,8 @@ protected Response execute(Request request) {
 
     // Set default headers
     if (defaultHeaders != null) {
-      builder.headers(defaultHeaders);
+      for(String key: defaultHeaders.names())
+        builder.header(key, defaultHeaders.get(key));
     }
 
     // Set User-Agent

From cc27cb9fc50a32e5947fd676cedab156f076a8b8 Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 14:41:03 -0500
Subject: [PATCH 15/29] Create REReturnType.java

---
 .../relationship_extraction/v1/REReturnType.java              | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
new file mode 100644
index 00000000000..2d85ff24207
--- /dev/null
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
@@ -0,0 +1,4 @@
+public enum REReturnType {
+  XML,
+  JSON
+}

From 46c1441fd68f140388eb9d12c57f5f6afc5973fb Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 14:51:48 -0500
Subject: [PATCH 16/29] #184 make sure it runs in java 1.6

---
 pom.xml | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 24923451694..6f50251629a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<version>2.7.1-SNAPSHOT</version>
@@ -179,10 +180,10 @@
 				<artifactId>jacoco-maven-plugin</artifactId>
 				<version>0.7.5.201505241946</version>
 				<configuration>
-				    <excludes>
-				        <exclude>com/ibm/watson/developer_cloud/*/v*/model/**/*.class</exclude>
-				        <exclude>com/ibm/watson/developer_cloud/**/*Example.*</exclude>
-				    </excludes>
+					<excludes>
+						<exclude>com/ibm/watson/developer_cloud/*/v*/model/**/*.class</exclude>
+						<exclude>com/ibm/watson/developer_cloud/**/*Example.*</exclude>
+					</excludes>
 				</configuration>
 				<executions>
 					<execution>
@@ -199,6 +200,26 @@
 					</execution>
 				</executions>
 			</plugin>
+<!-- 			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<version>1.11</version>
+				<executions>
+					<execution>
+						<phase>test</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<signature>
+						<groupId>org.codehaus.mojo.signature</groupId>
+						<artifactId>java16</artifactId>
+						<version>1.1</version>
+					</signature>
+				</configuration>
+			</plugin> -->
 		</plugins>
 		<resources>
 			<resource>

From d74517ed066ab15d7613f3fbb203635e21ae7af1 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 14:52:25 -0500
Subject: [PATCH 17/29] [speech-to-text] Fix for WebSocket being disconnected
 during final results. #182

---
 .../v1/websocket/WebSocketSpeechToTextClient.java             | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketSpeechToTextClient.java b/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketSpeechToTextClient.java
index 730f5b789be..8e09fb96648 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketSpeechToTextClient.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketSpeechToTextClient.java
@@ -69,10 +69,6 @@ public void onTextMessage(WebSocket websocket, String message) {
         } else if (json.has(RESULTS)) {
           SpeechResults transcript = GsonSingleton.getGson().fromJson(message, SpeechResults.class);
           delegate.onMessage(transcript);
-
-          // if final is true
-          if (transcript.isFinal())
-            websocket.disconnect();
         }
       } catch (JsonParseException e) {
         new RuntimeException("Error parsing the incoming message: " + message);

From eca25cc9d652852fe44557cf264def7e558ab68d Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 14:59:26 -0500
Subject: [PATCH 18/29] Update REReturnType.java

---
 .../relationship_extraction/v1/REReturnType.java                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
index 2d85ff24207..8be2e90bd5d 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
@@ -1,3 +1,5 @@
+package com.ibm.watson.developer_cloud.relationship_extraction.rereturntype;
+
 public enum REReturnType {
   XML,
   JSON

From 1e45a23d72b700c2481c532df0f2f8539ed62c6a Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 15:01:37 -0500
Subject: [PATCH 19/29] Update REReturnType.java

---
 .../relationship_extraction/v1/REReturnType.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
index 8be2e90bd5d..e4706c5e15f 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
@@ -1,4 +1,4 @@
-package com.ibm.watson.developer_cloud.relationship_extraction.rereturntype;
+package com.ibm.watson.developer_cloud.relationship_extraction.v1;
 
 public enum REReturnType {
   XML,

From 73b1e0c3392b2f0ccf505d6b6b2ad1e8715bfe78 Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 15:10:52 -0500
Subject: [PATCH 20/29] Update RelationshipExtraction.java

---
 .../v1/RelationshipExtraction.java            | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
index c18051bd5bd..361f45f9a9d 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
@@ -38,6 +38,9 @@ public class RelationshipExtraction extends WatsonService {
 
   /** The dataset. */
   private Dataset dataset;
+  
+  /** The return type. */
+  private String returnType;
 
   /**
    * Instantiates a new relationship extraction service.
@@ -65,7 +68,7 @@ public RelationshipExtraction() {
    * 
    * @param text the text to analyze
    * 
-   * @return the result as XML string
+   * @return the result as an XML/JSON string
    */
   public String extract(final String text) {
     Validate.notNull(dataset, "dataset cannot be null");
@@ -73,7 +76,7 @@ public String extract(final String text) {
 
     final Request request =
         RequestBuilder.post("/v1/sire/0")
-            .withForm("sid", dataset.getId(), "rt", "xml", "txt", text).build();
+            .withForm("sid", dataset.getId(), "rt", returnType, "txt", text).build();
     final Response response = execute(request);
     return ResponseUtil.getString(response);
   }
@@ -96,5 +99,18 @@ public Dataset getDataset() {
   public void setDataset(final Dataset dataset) {
     this.dataset = dataset;
   }
+  
+  /**
+   * Sets the returnType.
+   * 
+   * @param returnType the new returnType
+   */
+  public void setReturnType(final REReturnType returnType) {
+    if (returnType == REReturnType.XML) {
+      this.returnType = "xml";
+    } else if (returnType == REReturnType.JSON) {
+      this.returnType = "json";
+    }
+  }
 
 }

From abd876a4b6eb554e89f11f8f8ffed712fa0b52d6 Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 15:13:33 -0500
Subject: [PATCH 21/29] Update RelationshipExtraction.java

---
 .../relationship_extraction/v1/RelationshipExtraction.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
index 361f45f9a9d..cdf1c5e2923 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
@@ -40,7 +40,7 @@ public class RelationshipExtraction extends WatsonService {
   private Dataset dataset;
   
   /** The return type. */
-  private String returnType;
+  private String returnType = "xml";
 
   /**
    * Instantiates a new relationship extraction service.

From c2cb059fc9067e33db63b5c5831a3c2d52c5c9c3 Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 15:37:47 -0500
Subject: [PATCH 22/29] Update REReturnType.java

---
 .../relationship_extraction/v1/REReturnType.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
index e4706c5e15f..b4a9dfa5523 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
@@ -1,6 +1,6 @@
 package com.ibm.watson.developer_cloud.relationship_extraction.v1;
 
-public enum REReturnType {
+public enum ReturnType {
   XML,
   JSON
 }

From 850d4c5e2495f8c9697be44661a4dcb2e42b0df0 Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 15:38:03 -0500
Subject: [PATCH 23/29] Update RelationshipExtraction.java

---
 .../relationship_extraction/v1/RelationshipExtraction.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
index cdf1c5e2923..32303a7a678 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
@@ -105,7 +105,7 @@ public void setDataset(final Dataset dataset) {
    * 
    * @param returnType the new returnType
    */
-  public void setReturnType(final REReturnType returnType) {
+  public void setReturnType(final ReturnType returnType) {
     if (returnType == REReturnType.XML) {
       this.returnType = "xml";
     } else if (returnType == REReturnType.JSON) {

From 88b27b4aef1f5f99927613aa48f7f1ef3585e8fd Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 15:41:14 -0500
Subject: [PATCH 24/29] Rename REReturnType.java to ReturnType.java

---
 .../v1/{REReturnType.java => ReturnType.java}                     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/{REReturnType.java => ReturnType.java} (100%)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/ReturnType.java
similarity index 100%
rename from src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java
rename to src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/ReturnType.java

From 81e80b5470d994e71ea2b544342dd32559809cde Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 15:42:59 -0500
Subject: [PATCH 25/29] Update RelationshipExtraction.java

---
 .../relationship_extraction/v1/RelationshipExtraction.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
index 32303a7a678..85423ac7343 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
@@ -111,6 +111,6 @@ public void setReturnType(final ReturnType returnType) {
     } else if (returnType == REReturnType.JSON) {
       this.returnType = "json";
     }
-  }
+  } 
 
 }

From cbb5fd595eaeef7c47c8b86af447bbdab1620975 Mon Sep 17 00:00:00 2001
From: tanmayb123 <tajymany@gmail.com>
Date: Tue, 9 Feb 2016 15:45:34 -0500
Subject: [PATCH 26/29] Update RelationshipExtraction.java

---
 .../relationship_extraction/v1/RelationshipExtraction.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
index 85423ac7343..e55cb181120 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java
@@ -106,9 +106,9 @@ public void setDataset(final Dataset dataset) {
    * @param returnType the new returnType
    */
   public void setReturnType(final ReturnType returnType) {
-    if (returnType == REReturnType.XML) {
+    if (returnType == ReturnType.XML) {
       this.returnType = "xml";
-    } else if (returnType == REReturnType.JSON) {
+    } else if (returnType == ReturnType.JSON) {
       this.returnType = "json";
     }
   } 

From 5902df2331ca950690702b17bfde296399bc42b1 Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 17:25:15 -0500
Subject: [PATCH 27/29] [speech-to-text] Send close message to the WebSocket
 once we get the final results

---
 .../v1/websocket/WebSocketSpeechToTextClient.java   | 13 +++++++++----
 .../speech_to_text/v1/SpeechToTextIT.java           |  3 +--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketSpeechToTextClient.java b/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketSpeechToTextClient.java
index 8e09fb96648..8f95a2a9002 100644
--- a/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketSpeechToTextClient.java
+++ b/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketSpeechToTextClient.java
@@ -42,7 +42,7 @@ public class WebSocketSpeechToTextClient {
    */
   public class WebSocketListener extends WebSocketAdapter {
     private RecognizeDelegate delegate;
-
+    private boolean audioSent = false;
     /**
      * Instantiates a new WebSocket listener.
      * 
@@ -51,6 +51,7 @@ public class WebSocketListener extends WebSocketAdapter {
     public WebSocketListener(RecognizeDelegate delegate) {
       super();
       this.delegate = delegate;
+      audioSent = false;
     }
 
     /*
@@ -69,6 +70,8 @@ public void onTextMessage(WebSocket websocket, String message) {
         } else if (json.has(RESULTS)) {
           SpeechResults transcript = GsonSingleton.getGson().fromJson(message, SpeechResults.class);
           delegate.onMessage(transcript);
+        } else if (audioSent) {
+          websocket.sendClose();
         }
       } catch (JsonParseException e) {
         new RuntimeException("Error parsing the incoming message: " + message);
@@ -170,7 +173,10 @@ public void recognize(InputStream stream, RecognizeOptions options, RecognizeDel
 
       // 4. Send the input stream as binary data
       sendInputStream(ws, stream);
-
+      
+      // 5. Tell the listener that we sent the audio
+      listener.audioSent = true;
+      
       // 5. Send stop message
       ws.sendText(buildStopMessage());
 
@@ -217,9 +223,8 @@ private void sendInputStream(WebSocket ws, InputStream stream) throws IOExceptio
       else
         ws.sendBinary(Arrays.copyOfRange(buffer, 0, read));
 
-      Thread.sleep(10);
+      Thread.sleep(20);
     }
-
     stream.close();
   }
 
diff --git a/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextIT.java b/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextIT.java
index beb92da0120..4f17e74a8ed 100644
--- a/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextIT.java
+++ b/src/test/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToTextIT.java
@@ -204,8 +204,7 @@ public void onError(Exception e) {
       public void onMessage(SpeechResults speechResults) {
         if (speechResults != null && speechResults.isFinal()) {
           asyncResults = speechResults;
-          // System.out.println(speechResults);
-          lock.countDown();
+          //System.out.println(speechResults);
         }
       }
 

From 322cbd75f11630b9bce33f242341596486517ddb Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 17:29:59 -0500
Subject: [PATCH 28/29] [maven-release-plugin] prepare release java-sdk-2.7.1

---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6f50251629a..a8435de4d6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
-	<version>2.7.1-SNAPSHOT</version>
+	<version>2.7.1</version>
 	<packaging>jar</packaging>
 	<artifactId>java-sdk</artifactId>
 	<name>Watson Developer Cloud Java SDK</name>
@@ -76,7 +75,7 @@
 		<connection>SSH</connection>
 		<developerConnection>scm:git:git@github.com:watson-developer-cloud/java-sdk.git</developerConnection>
 		<url>https://github.com/watson-developer-cloud/java-sdk</url>
-		<tag>HEAD</tag>
+		<tag>java-sdk-2.7.1</tag>
 	</scm>
 	<build>
 		<plugins>

From e2b404175ff442132045ba19326728b949a6be2c Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Tue, 9 Feb 2016 17:30:05 -0500
Subject: [PATCH 29/29] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8435de4d6c..f2f705c884e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
-	<version>2.7.1</version>
+	<version>2.7.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<artifactId>java-sdk</artifactId>
 	<name>Watson Developer Cloud Java SDK</name>
@@ -75,7 +75,7 @@
 		<connection>SSH</connection>
 		<developerConnection>scm:git:git@github.com:watson-developer-cloud/java-sdk.git</developerConnection>
 		<url>https://github.com/watson-developer-cloud/java-sdk</url>
-		<tag>java-sdk-2.7.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 	<build>
 		<plugins>