Fix default headers replacing existing headers in WatsonService

Author: germanattanasio

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);
 

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