Merge changes and pull requests

Author: germanattanasio

examples/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationExample.java

@@ -13,6 +13,7 @@
  */
 package com.ibm.watson.developer_cloud.language_translation.v2;
 
+import com.ibm.watson.developer_cloud.language_translation.v2.model.Language;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationResult;
 
 public class LanguageTranslationExample {
@@ -21,7 +22,7 @@ public static void main(String[] args) {
     LanguageTranslation service = new LanguageTranslation();
     service.setUsernameAndPassword("<username>", "<password>");
 
-    TranslationResult translationResult = service.translate("hello", "en", "es");
+    TranslationResult translationResult = service.translate("hello", Language.ENGLISH, Language.SPANISH);
 
     System.out.println(translationResult);
   }

examples/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TranslateAndSynthesizeExample.java

@@ -8,6 +8,7 @@
 
 import com.ibm.watson.developer_cloud.http.HttpMediaType;
 import com.ibm.watson.developer_cloud.language_translation.v2.LanguageTranslation;
+import com.ibm.watson.developer_cloud.language_translation.v2.model.Language;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationResult;
 import com.ibm.watson.developer_cloud.text_to_speech.v1.TextToSpeech;
 import com.ibm.watson.developer_cloud.text_to_speech.v1.model.Voice;
@@ -24,7 +25,7 @@ public static void main(String[] args) throws IOException {
     String text = "Greetings from Watson Developer Cloudl";
 
     // translate 
-    TranslationResult translationResult = translator.translate(text, "en", "es");
+    TranslationResult translationResult = translator.translate(text, Language.ENGLISH, Language.SPANISH);
     String translation = translationResult.getTranslations().get(0).getTranslation();
 
     // synthesize

src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationIT.java

@@ -37,8 +37,6 @@
  */
 public class LanguageTranslationIT extends WatsonServiceTest {
 
-  private static final String SPANISH = "es";
-  private static final String ENGLISH = "en";
   private static final String ENGLISH_TO_SPANISH = "en-es";
   private static final String RESOURCE = "src/test/resources/language_translation/";
 

src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationTest.java

@@ -18,7 +18,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
-import io.netty.handler.codec.http.HttpHeaders;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -39,14 +38,15 @@
 import com.ibm.watson.developer_cloud.language_translation.v2.model.CreateModelOptions;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.IdentifiableLanguage;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.IdentifiedLanguage;
-import com.ibm.watson.developer_cloud.language_translation.v2.model.Language;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.LanguageList;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.Translation;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationModel;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationModelList;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationResult;
 import com.ibm.watson.developer_cloud.util.GsonSingleton;
 
+import io.netty.handler.codec.http.HttpHeaders;
+
 public class LanguageTranslationTest extends WatsonServiceUnitTest {
 
   private final static String GET_MODELS_PATH = "/v2/models";

src/test/java/com/ibm/watson/developer_cloud/util/TestUtils.java

@@ -19,12 +19,11 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import java.util.Iterator;
-
-import junit.framework.AssertionFailedError;
 
 import org.junit.Ignore;
 
+import junit.framework.AssertionFailedError;
+
 /**
  * The Class TestUtils.
  */