Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
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.IdentifiedLanguageList;
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;
Expand Down Expand Up @@ -144,7 +145,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();
}

Expand Down Expand Up @@ -206,15 +207,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();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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;
Expand All @@ -57,7 +57,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;

Expand All @@ -79,7 +79,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);
}
Expand Down