added custom model support for language translation

Author: germanattanasio

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

@@ -15,6 +15,7 @@
  */
 package com.ibm.watson.developer_cloud.language_translation.v2;
 
+import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -50,12 +51,16 @@
  */
 public class LanguageTranslation extends WatsonService {
 
+	public static final String BASE_MODEL_ID = "base_model_id";
+	public static final String FORCED_GLOSSARY = "forced_glossary";
 	public static final String DEFAULT = "default";
-	private static final String LANGUAGES = "languages";
 	public static final String MODEL_ID = "model_id";
 	public static final String SOURCE = "source";
 	public static final String TARGET = "target";
 	public static final String TEXT = "text";
+	public static final String NAME = "name";
+
+	private static final String LANGUAGES = "languages";
 
 	/** The url. */
 	private static final String URL = "https://gateway.watsonplatform.net/language-translation/api";
@@ -79,11 +84,11 @@ public LanguageTranslation() {
 		setEndPoint(URL);
 	}
 
-	
+
 
 	/**
 	 * Retrieves the list of identifiable languages.
-	 * 
+	 *
 	 * @return the identifiable languages
 	 * @see TranslationModel
 	 */
@@ -101,20 +106,92 @@ public List<IdentifiableLanguage> getIdentifiableLanguages() {
 			throw new RuntimeException(e);
 		}
 	}
-	
+
 	/**
-	 * Retrieves the list of models.
-	 * 
+	 * Retrieves the list of translation models.
+	 *
 	 * @return the translation models
 	 * @see TranslationModel
 	 */
 	public List<TranslationModel> getModels() {
 		return getModels(null, null, null);
 	}
 
+	/**
+	 * Retrieves a translation models.
+	 *
+ 	 * @param modelId the model identifier
+	 * @return the translation models
+	 * @see TranslationModel
+	 */
+	public TranslationModel getModel(String modelId) {
+		if (modelId == null || modelId.isEmpty())
+			throw new IllegalArgumentException("model_id can not be null or empty");
+
+
+		HttpRequestBase request = Request.Get("/v2/models/" + modelId).build();
+		try {
+			HttpResponse response = execute(request);
+			String modelAsString = ResponseUtil.getString(response);
+			TranslationModel model = getGson().fromJson(modelAsString,TranslationModel.class);
+			return model;
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * Deletes a translation models.
+	 *
+ 	 * @param modelId the model identifier
+	 */
+	public void deleteModel(String modelId) {
+		if (modelId == null || modelId.isEmpty())
+			throw new IllegalArgumentException("model_id can not be null or empty");
+
+		HttpRequestBase request = Request.Delete("/v2/models/" + modelId).build();
+		execute(request);
+	}
+
+	/**
+	 * Creates a translation models.
+	 *
+ 	 * @param params String name the model name,
+ 	 * 				 String base_model_id the model id to use as base model,
+ 	 * 				 File forced_glossary the tmx file use in the model
+	 */
+	public TranslationModel createModel(Map<String,Object> params) {
+		// forced_glossary
+		File forcedGlossary  = (File) params.get(FORCED_GLOSSARY);
+		if (forcedGlossary == null || !forcedGlossary.exists() || !forcedGlossary.isFile())
+			throw new IllegalArgumentException("forced_glossary is not a valid file");
+
+		// base_model_id
+		String baseModelId  = (String) params.get(BASE_MODEL_ID);
+		if (baseModelId == null || baseModelId.isEmpty())
+			throw new IllegalArgumentException("base_model_id can not be null or empty");
+
+		Request request = Request.Post("/v2/models");
+
+		request.withForm(FORCED_GLOSSARY, forcedGlossary);
+		request.withForm(BASE_MODEL_ID, baseModelId);
+
+		if (params.containsKey(NAME))
+			request.withForm(NAME, (String)params.get(NAME));
+
+		HttpRequestBase requestBase = request.build();
+		try {
+			HttpResponse response = execute(requestBase);
+			String modelAsString = ResponseUtil.getString(response);
+			TranslationModel model = getGson().fromJson(modelAsString, TranslationModel.class);
+			return model;
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}	}
+
 	/**
 	 * Retrieves the list of models.
-	 * 
+	 *
 	 * @param showDefault
 	 *            show default models
 	 * @param source
@@ -151,7 +228,7 @@ public List<TranslationModel> getModels(final Boolean showDefault,
 
 	/**
 	 * Identify language in which text is written.
-	 * 
+	 *
 	 * @param text
 	 *            the text to identify
 	 * @return the identified language
@@ -174,7 +251,7 @@ public List<IdentifiedLanguage> identify(final String text) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
@@ -195,10 +272,10 @@ public String toString() {
 	 * @param source            the source language
 	 * @param target            the target language
 	 * @param model_id            the model id
-	 * @return The {@link TranslationResult} 
+	 * @return The {@link TranslationResult}
 	 */
 	public TranslationResult translate(final Map<String, Object> params) {
-		
+
 		final String source = (String) params.get(SOURCE);
 		final String target = (String) params.get(TARGET);
 		final String modelId = (String) params.get(MODEL_ID);
@@ -211,7 +288,7 @@ public TranslationResult translate(final Map<String, Object> params) {
 		} else {
 			text = null;
 		}
-		
+
 		if ((modelId == null || modelId.isEmpty())
 				&& (source == null || source.isEmpty() || target == null || target
 						.isEmpty()))
@@ -229,10 +306,10 @@ public TranslationResult translate(final Map<String, Object> params) {
 			paragraphs.add(new JsonPrimitive(paragraph));
 		}
 		contentJson.add(TEXT, paragraphs);
-		
+
 		Request requestBuilder = Request.Post("/v2/translate")
 				.withContent(contentJson);
-		
+
 		if (source != null && !source.isEmpty())
 			requestBuilder.withQuery(SOURCE, source);
 
@@ -262,22 +339,22 @@ public TranslationResult translate(final Map<String, Object> params) {
 	 *
 	 * @param text            The submitted paragraphs to translate
 	 * @param model_id            the model id
-	 * @return The {@link TranslationResult} 
+	 * @return The {@link TranslationResult}
 	 */
 	public TranslationResult translate(final String text,final  String modelId) {
 		Map<String, Object> params = new HashMap<String,Object>();
 		params.put(TEXT, text);
 		params.put(MODEL_ID, modelId);
 		return translate(params);
 	}
-	
+
 	/**
 	 * Translate text using source and target languages
 	 *
 	 * @param text            The submitted paragraphs to translate
 	 * @param source          The source language
 	 * @param target          The target language
-	 * @return The {@link TranslationResult} 
+	 * @return The {@link TranslationResult}
 	 */
 	public TranslationResult translate(final String text,final String source,final String target) {
 		Map<String, Object> params = new HashMap<String,Object>();
@@ -286,5 +363,5 @@ public TranslationResult translate(final String text,final String source,final S
 		params.put(TARGET, target);
 		return translate(params);
 	}
-	
+
 }

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

@@ -20,7 +20,7 @@
 
 /**
  * Identifiable language used by the {@link LanguageTranslation} service.
- * 
+ *
  * @author German Attanasio Ruiz (germanatt@us.ibm.com)
  */
 public class IdentifiableLanguage {
@@ -33,7 +33,7 @@ public class IdentifiableLanguage {
 
 	/**
 	 * Gets the name.
-	 * 
+	 *
 	 * @return the name
 	 */
 	public String getName() {
@@ -42,7 +42,7 @@ public String getName() {
 
 	/**
 	 * Instantiates a new identifiable language.
-	 * 
+	 *
 	 * @param language
 	 *            the language
 	 * @param name
@@ -56,7 +56,7 @@ public IdentifiableLanguage(final String language, final String name) {
 
 	/**
 	 * Instantiates a new language.
-	 * 
+	 *
 	 * @param language
 	 *            the language
 	 */
@@ -67,7 +67,7 @@ public IdentifiableLanguage(final String language) {
 
 	/**
 	 * Gets the language.
-	 * 
+	 *
 	 * @return the language
 	 */
 	public String getLanguage() {
@@ -76,7 +76,7 @@ public String getLanguage() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override

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

@@ -20,7 +20,7 @@
 
 /**
  * Language detected by the {@link LanguageTranslation} service.
- * 
+ *
  * @author German Attanasio Ruiz (germanatt@us.ibm.com)
  */
 public class IdentifiedLanguage extends IdentifiableLanguage {
@@ -30,7 +30,7 @@ public class IdentifiedLanguage extends IdentifiableLanguage {
 
 	/**
 	 * Instantiates a new language.
-	 * 
+	 *
 	 * @param language
 	 *            the language
 	 * @param confidence
@@ -43,7 +43,7 @@ public IdentifiedLanguage(final String language, final double confidence) {
 
 	/**
 	 * Gets the confidence.
-	 * 
+	 *
 	 * @return the confidence
 	 */
 	public Double getConfidence() {
@@ -52,7 +52,7 @@ public Double getConfidence() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override

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

@@ -17,7 +17,7 @@ public class Translation {
 
 	/**
 	 * Gets the translation.
-	 * 
+	 *
 	 * @return The translation
 	 */
 	public String getTranslation() {
@@ -26,7 +26,7 @@ public String getTranslation() {
 
 	/**
 	 * Sets the translation.
-	 * 
+	 *
 	 * @param translation
 	 *            The translation
 	 */
@@ -36,7 +36,7 @@ public void setTranslation(final String translation) {
 
 	/**
 	 * With translation.
-	 * 
+	 *
 	 * @param translation
 	 *            the translation
 	 * @return the translation
@@ -48,7 +48,7 @@ public Translation withTranslation(final String translation) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override