From d4735075c5fcb0793cd81308c53af3846bb49709 Mon Sep 17 00:00:00 2001 From: grapebaba <281165273@qq.com> Date: Thu, 14 Apr 2016 14:27:34 +0800 Subject: [PATCH 1/4] [Language-translation] rename. --- .../language_translation/v2/LanguageTranslation.java | 6 +++--- .../{LanguageList.java => IdentifiableLanguageList.java} | 2 +- .../language_translation/v2/LanguageTranslationTest.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/{LanguageList.java => IdentifiableLanguageList.java} (95%) 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 de9629672f6..43df313586c 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 @@ -24,7 +24,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.TranslationModel; import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationModelList; import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationResult; @@ -144,7 +144,7 @@ public void deleteModel(String modelId) { */ public List 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(); } @@ -212,7 +212,7 @@ public List identify(final String text) { .withHeader(HttpHeaders.ACCEPT, HttpMediaType.APPLICATION_JSON) .withBodyContent(text, HttpMediaType.TEXT_PLAIN).build(); - final LanguageList languages = executeRequest(request, LanguageList.class); + final IdentifiableLanguageList languages = executeRequest(request, IdentifiableLanguageList.class); return (List) (List) languages.getLanguages(); } diff --git a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/LanguageList.java b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java similarity index 95% rename from src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/LanguageList.java rename to src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java index 94c272d196d..f367108eb21 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/LanguageList.java +++ b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java @@ -22,7 +22,7 @@ * Language list used by the {@link LanguageTranslation} service. * */ -public class LanguageList extends GenericModel { +public class IdentifiableLanguageList extends GenericModel { private List languages; diff --git a/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationTest.java b/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationTest.java index c10ac9be628..0ca5497fbf8 100644 --- a/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationTest.java +++ b/src/test/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslationTest.java @@ -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; @@ -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; @@ -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); } From e3b00a5689e386a2e8dda852ef344c51678ad6c9 Mon Sep 17 00:00:00 2001 From: grapebaba <281165273@qq.com> Date: Thu, 14 Apr 2016 14:28:29 +0800 Subject: [PATCH 2/4] [Language-translation] rename. --- .../language_translation/v2/model/IdentifiableLanguageList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java index f367108eb21..487ab6c69de 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java +++ b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiableLanguageList.java @@ -19,7 +19,7 @@ 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 IdentifiableLanguageList extends GenericModel { From f97a1caa0b235848b64cec47ea71b520679a2293 Mon Sep 17 00:00:00 2001 From: grapebaba <281165273@qq.com> Date: Thu, 14 Apr 2016 14:37:49 +0800 Subject: [PATCH 3/4] [Language-translation] fix issue #240. --- .../v2/LanguageTranslation.java | 13 ++---- .../v2/model/IdentifiedLanguageList.java | 46 +++++++++++++++++++ 2 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiedLanguageList.java 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 43df313586c..e941bd3a4f2 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 @@ -21,13 +21,7 @@ import com.ibm.watson.developer_cloud.http.HttpHeaders; import com.ibm.watson.developer_cloud.http.HttpMediaType; 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.IdentifiedLanguage; -import com.ibm.watson.developer_cloud.language_translation.v2.model.IdentifiableLanguageList; -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.language_translation.v2.model.*; import com.ibm.watson.developer_cloud.service.WatsonService; import com.ibm.watson.developer_cloud.util.Validate; import com.squareup.okhttp.MultipartBuilder; @@ -206,15 +200,14 @@ public List getModels(final Boolean showDefault, final String * @param text the text to identify * @return the identified language */ - @SuppressWarnings("unchecked") public List identify(final String text) { final Request request = RequestBuilder.post(PATH_IDENTIFY) .withHeader(HttpHeaders.ACCEPT, HttpMediaType.APPLICATION_JSON) .withBodyContent(text, HttpMediaType.TEXT_PLAIN).build(); - final IdentifiableLanguageList languages = executeRequest(request, IdentifiableLanguageList.class); + final IdentifiedLanguageList languages = executeRequest(request, IdentifiedLanguageList.class); - return (List) (List) languages.getLanguages(); + return languages.getLanguages(); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiedLanguageList.java b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/IdentifiedLanguageList.java new file mode 100644 index 00000000000..caf687d4493 --- /dev/null +++ b/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 languages; + + /** + * Gets the languages. + * + * @return the languages + */ + public List getLanguages() { + return languages; + } + + /** + * Sets the languages. + * + * @param languages the new languages + */ + public void setLanguages(List languages) { + this.languages = languages; + } +} From a9b10f2dcc40a36cc36bc0b786aa00edd1ada8b8 Mon Sep 17 00:00:00 2001 From: grapebaba <281165273@qq.com> Date: Thu, 14 Apr 2016 14:57:55 +0800 Subject: [PATCH 4/4] [Language-translation] cancel change import *. --- .../language_translation/v2/LanguageTranslation.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 e941bd3a4f2..2f6183334fd 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 @@ -21,7 +21,14 @@ import com.ibm.watson.developer_cloud.http.HttpHeaders; import com.ibm.watson.developer_cloud.http.HttpMediaType; import com.ibm.watson.developer_cloud.http.RequestBuilder; -import com.ibm.watson.developer_cloud.language_translation.v2.model.*; +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.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; import com.ibm.watson.developer_cloud.service.WatsonService; import com.ibm.watson.developer_cloud.util.Validate; import com.squareup.okhttp.MultipartBuilder;