Merge remote-tracking branch 'origin/master'

# Conflicts:
#
src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/Lan
guageTranslation.java

Author: germanattanasio

src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java

@@ -23,9 +23,10 @@
 import com.ibm.watson.developer_cloud.http.RequestBuilder;
 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.IdentifiableLanguageList;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.IdentifiedLanguage;
+import com.ibm.watson.developer_cloud.language_translation.v2.model.IdentifiedLanguageList;
 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.TranslationModel;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationModelList;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationResult;
@@ -145,7 +146,7 @@ public void deleteModel(String modelId) {
    */
   public List<IdentifiableLanguage> getIdentifiableLanguages() {
     final RequestBuilder requestBuilder = RequestBuilder.get(PATH_IDENTIFIABLE_LANGUAGES);
-    final LanguageList languages = executeRequest(requestBuilder.build(), LanguageList.class);
+    final IdentifiableLanguageList languages = executeRequest(requestBuilder.build(), IdentifiableLanguageList.class);
     return languages.getLanguages();
   }
 
@@ -207,15 +208,14 @@ public List<TranslationModel> getModels(final Boolean showDefault, final String
    * @param text the text to identify
    * @return the identified language
    */
-  @SuppressWarnings("unchecked")
   public List<IdentifiedLanguage> identify(final String text) {
     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);
+    final IdentifiedLanguageList languages = executeRequest(request, IdentifiedLanguageList.class);
 
-    return (List<IdentifiedLanguage>) (List<?>) languages.getLanguages();
+    return languages.getLanguages();
   }
 
   /**

…e_translation/v2/model/LanguageList.java …n/v2/model/IdentifiableLanguageList.javasrc/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/LanguageList.java renamed to src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/LanguageList.java renamed to src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java

@@ -19,10 +19,10 @@
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
- * Language list used by the {@link LanguageTranslation} service.
+ * Identifiable language list used by the {@link LanguageTranslation} service.
  * 
  */
-public class LanguageList extends GenericModel {
+public class IdentifiableLanguageList extends GenericModel {
 
   private List<IdentifiableLanguage> languages;
 

src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiedLanguageList.java

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2015 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.language_translation.v2.model;
+
+import java.util.List;
+
+import com.ibm.watson.developer_cloud.language_translation.v2.LanguageTranslation;
+import com.ibm.watson.developer_cloud.service.model.GenericModel;
+
+/**
+ * Identified language list used by the {@link LanguageTranslation} service.
+ *
+ */
+public class IdentifiedLanguageList extends GenericModel {
+
+    private List<IdentifiedLanguage> languages;
+
+    /**
+     * Gets the languages.
+     *
+     * @return the languages
+     */
+    public List<IdentifiedLanguage> getLanguages() {
+        return languages;
+    }
+
+    /**
+     * Sets the languages.
+     *
+     * @param languages the new languages
+     */
+    public void setLanguages(List<IdentifiedLanguage> languages) {
+        this.languages = languages;
+    }
+}

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

@@ -38,7 +38,7 @@
 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.LanguageList;
+import com.ibm.watson.developer_cloud.language_translation.v2.model.IdentifiableLanguageList;
 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;
@@ -58,7 +58,7 @@ public class LanguageTranslationTest extends WatsonServiceUnitTest {
   private String modelId;
   private LanguageTranslation service;
   private String text;
-  private LanguageList identifiableLanguages;
+  private IdentifiableLanguageList identifiableLanguages;
   private TranslationModel model;
   private TranslationModelList models;
 
@@ -80,7 +80,7 @@ public void setUp() throws Exception {
 
     // fixtures
     identifiableLanguages =
-        loadFixture(RESOURCE + "identifiable_languages.json", LanguageList.class);
+        loadFixture(RESOURCE + "identifiable_languages.json", IdentifiableLanguageList.class);
     model = loadFixture(RESOURCE + "model.json", TranslationModel.class);
     models = loadFixture(RESOURCE + "models.json", TranslationModelList.class);
   }