switch from LanguageModel to TranslationModel

Author: germanattanasio

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

@@ -30,7 +30,7 @@
 import com.google.gson.reflect.TypeToken;
 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.LanguageModel;
+import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationModel;
 import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationResult;
 import com.ibm.watson.developer_cloud.service.Request;
 import com.ibm.watson.developer_cloud.service.WatsonService;
@@ -65,11 +65,11 @@ public class LanguageTranslation extends WatsonService {
 	}.getType();
 
 	/** The language model list type. */
-	private final Type languageModelListType = new TypeToken<List<IdentifiedLanguage>>() {
+	private final Type translationModelListType = new TypeToken<List<IdentifiedLanguage>>() {
 	}.getType();
 
 	/** The model list type. */
-	private final Type modelListType = new TypeToken<List<LanguageModel>>() {
+	private final Type modelListType = new TypeToken<List<TranslationModel>>() {
 	}.getType();
 
 	/**
@@ -85,7 +85,7 @@ public LanguageTranslation() {
 	 * Retrieves the list of identifiable languages.
 	 * 
 	 * @return the identifiable languages
-	 * @see LanguageModel
+	 * @see TranslationModel
 	 */
 	public List<IdentifiableLanguage> getIdentifiableLanguages() {
 		Request request = Request.Get("/v2/identifiable_languages");
@@ -106,9 +106,9 @@ public List<IdentifiableLanguage> getIdentifiableLanguages() {
 	 * Retrieves the list of models.
 	 * 
 	 * @return the translation models
-	 * @see LanguageModel
+	 * @see TranslationModel
 	 */
-	public List<LanguageModel> getModels() {
+	public List<TranslationModel> getModels() {
 		return getModels(null, null, null);
 	}
 
@@ -122,9 +122,9 @@ public List<LanguageModel> getModels() {
 	 * @param target
 	 *            the target
 	 * @return the translation models
-	 * @see LanguageModel
+	 * @see TranslationModel
 	 */
-	public List<LanguageModel> getModels(final Boolean showDefault,
+	public List<TranslationModel> getModels(final Boolean showDefault,
 			final String source, final String target) {
 		Request request = Request.Get("/v2/models");
 
@@ -141,7 +141,7 @@ public List<LanguageModel> getModels(final Boolean showDefault,
 		try {
 			HttpResponse response = execute(requestBase);
 			JsonObject jsonObject = ResponseUtil.getJsonObject(response);
-			List<LanguageModel> models = getGson().fromJson(
+			List<TranslationModel> models = getGson().fromJson(
 					jsonObject.get("models"), modelListType);
 			return models;
 		} catch (IOException e) {
@@ -165,7 +165,7 @@ public List<IdentifiedLanguage> identify(final String text) {
 			HttpResponse response = execute(request);
 			JsonObject jsonObject = ResponseUtil.getJsonObject(response);
 			List<IdentifiedLanguage> identifiedLanguages = getGson().fromJson(
-					jsonObject.get(LANGUAGES), languageModelListType);
+					jsonObject.get(LANGUAGES), translationModelListType);
 			return identifiedLanguages;
 		} catch (IOException e) {
 			throw new RuntimeException(e);

…_translation/v2/model/LanguageModel.java …anslation/v2/model/TranslationModel.javasrc/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/LanguageModel.java renamed to src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/TranslationModel.java src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/LanguageModel.java renamed to src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/model/TranslationModel.java

@@ -2,14 +2,13 @@
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
-import com.ibm.watson.developer_cloud.language_translation.v2.LanguageTranslation;
 
 /**
- * Language Model used by the {@link LanguageTranslation}.
+ * Language Model used by the {@link TranslationModel}.
  *
  * @author German Attanasio Ruiz germanatt@us.ibm.com
  */
-public class LanguageModel {
+public class TranslationModel {
 
 	/** The model id. */
 	@SerializedName("model_id")
@@ -70,7 +69,7 @@ public void setModelId(final String modelId) {
 	 *            the model id
 	 * @return the language model set
 	 */
-	public LanguageModel withModelId(final String modelId) {
+	public TranslationModel withModelId(final String modelId) {
 		this.modelId = modelId;
 		return this;
 	}
@@ -101,7 +100,7 @@ public void setSource(final String source) {
 	 *            the source
 	 * @return the language model set
 	 */
-	public LanguageModel withSource(final String source) {
+	public TranslationModel withSource(final String source) {
 		this.source = source;
 		return this;
 	}
@@ -132,7 +131,7 @@ public void setTarget(final String target) {
 	 *            the target
 	 * @return the language model set
 	 */
-	public LanguageModel withTarget(final String target) {
+	public TranslationModel withTarget(final String target) {
 		this.target = target;
 		return this;
 	}
@@ -163,7 +162,7 @@ public void setBaseModelId(final String baseModelId) {
 	 *            the base model id
 	 * @return the language model set
 	 */
-	public LanguageModel withBaseModelId(final String baseModelId) {
+	public TranslationModel withBaseModelId(final String baseModelId) {
 		this.baseModelId = baseModelId;
 		return this;
 	}
@@ -194,7 +193,7 @@ public void setDomain(final String domain) {
 	 *            the domain
 	 * @return the language model set
 	 */
-	public LanguageModel withDomain(final String domain) {
+	public TranslationModel withDomain(final String domain) {
 		this.domain = domain;
 		return this;
 	}
@@ -225,7 +224,7 @@ public void setCustomizable(final boolean customizable) {
 	 *            the customizable
 	 * @return the language model set
 	 */
-	public LanguageModel withCustomizable(final boolean customizable) {
+	public TranslationModel withCustomizable(final boolean customizable) {
 		this.customizable = customizable;
 		return this;
 	}
@@ -256,7 +255,7 @@ public void setDefaultModel(final boolean defaultModel) {
 	 *            the default model
 	 * @return the language model set
 	 */
-	public LanguageModel withDefaultModel(final boolean defaultModel) {
+	public TranslationModel withDefaultModel(final boolean defaultModel) {
 		this.defaultModel = defaultModel;
 		return this;
 	}
@@ -287,7 +286,7 @@ public void setOwner(final String owner) {
 	 *            the owner
 	 * @return the language model set
 	 */
-	public LanguageModel withOwner(final String owner) {
+	public TranslationModel withOwner(final String owner) {
 		this.owner = owner;
 		return this;
 	}
@@ -318,7 +317,7 @@ public void setStatus(final String status) {
 	 *            the status
 	 * @return the language model set
 	 */
-	public LanguageModel withStatus(final String status) {
+	public TranslationModel withStatus(final String status) {
 		this.status = status;
 		return this;
 	}
@@ -349,7 +348,7 @@ public void setName(final String name) {
 	 *            the name
 	 * @return the language model set
 	 */
-	public LanguageModel withName(final String name) {
+	public TranslationModel withName(final String name) {
 		this.name = name;
 		return this;
 	}