support 'format' option for google translate api

Patrick Huang · Patrick Huang · commit ffdf22efa221 · 2017-07-19T10:21:01.000+10:00
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java
@@ -95,6 +95,16 @@ public static TranslateOption targetLanguage(String targetLanguage) {
     public static TranslateOption model(String model) {
       return new TranslateOption(TranslateRpc.Option.MODEL, model);
     }
+
+    /**
+     * Sets the format of the source text, in either HTML (default) or plain-text.
+     * A value of html indicates HTML and a value of text indicates plain-text.
+     *
+     * @param format the format of the source text (html|text)
+     */
+    public static TranslateOption format(String format) {
+      return new TranslateOption(TranslateRpc.Option.FORMAT, format);
+    }
   }
 
   /**
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java
@@ -126,6 +126,7 @@ public List<TranslationsResource> translate(List<String> texts, Map<Option, ?> o
               .setSource(sourceLanguage)
               .setKey(options.getApiKey())
               .set("model", Option.MODEL.getString(optionMap))
+              .set(Option.FORMAT.value(), Option.FORMAT.getString(optionMap))
               .execute()
               .getTranslations();
       return Lists.transform(
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/TranslateRpc.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/TranslateRpc.java
@@ -29,7 +29,8 @@ public interface TranslateRpc extends ServiceRpc {
   enum Option {
     SOURCE_LANGUAGE("source"),
     TARGET_LANGUAGE("target"),
-    MODEL("model");
+    MODEL("model"),
+    FORMAT("format");
 
     private final String value;
 
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java b/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java
@@ -91,11 +91,13 @@ public class TranslateImplTest {
   private static final TranslateOption SOURCE_LANGUAGE_OPTION =
       TranslateOption.sourceLanguage("de");
   private static final TranslateOption MODEL_OPTION = TranslateOption.model("nmt");
+  private static final TranslateOption FORMAT_OPTION = TranslateOption.format("text");
   private static final Map<TranslateRpc.Option, ?> TRANSLATE_OPTIONS =
       ImmutableMap.of(
           TranslateRpc.Option.TARGET_LANGUAGE, TARGET_LANGUAGE_OPTION.getValue(),
           TranslateRpc.Option.SOURCE_LANGUAGE, SOURCE_LANGUAGE_OPTION.getValue(),
-          TranslateRpc.Option.MODEL, "nmt");
+          TranslateRpc.Option.MODEL, "nmt",
+          TranslateRpc.Option.FORMAT, "text");
   private static final RetrySettings NO_RETRY_SETTINGS = ServiceOptions.getNoRetrySettings();
 
   private TranslateOptions options;
@@ -316,7 +318,7 @@ public void testTranslateWithOptions() {
     initializeService();
     assertEquals(
         TRANSLATION2,
-        translate.translate(text, TARGET_LANGUAGE_OPTION, SOURCE_LANGUAGE_OPTION, MODEL_OPTION));
+        translate.translate(text, TARGET_LANGUAGE_OPTION, SOURCE_LANGUAGE_OPTION, MODEL_OPTION, FORMAT_OPTION));
     verify();
   }
 
@@ -343,7 +345,7 @@ public void testTranslateListWithOptions() {
     initializeService();
     assertEquals(
         ImmutableList.of(TRANSLATION2),
-        translate.translate(texts, TARGET_LANGUAGE_OPTION, SOURCE_LANGUAGE_OPTION, MODEL_OPTION));
+        translate.translate(texts, TARGET_LANGUAGE_OPTION, SOURCE_LANGUAGE_OPTION, MODEL_OPTION, FORMAT_OPTION));
     verify();
   }
 
