---

Patrick Huang · tcoffee-google · commit e4c612fa90a1 · 2017-07-20T10:48:27.000-07:00
yaml --- r: 8179 b: refs/heads/tswast-patch-1 c: 6bd2e32 h: refs/heads/master i: 8177: 7277914 8175: 2160085
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 3d9a08451826714593fdf309704b8d902a994d99
+refs/heads/tswast-patch-1: 6bd2e329a9274404a8429c163cd4892f47c3ca2b
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java b/branches/tswast-patch-1/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 {@code html} indicates HTML and a value of {@code text} indicates plain-text.
+     *
+     * @param format the format of the source text
+     */
+    public static TranslateOption format(String format) {
+      return new TranslateOption(TranslateRpc.Option.FORMAT, format);
+    }
   }
 
   /**
diff --git a/branches/tswast-patch-1/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java b/branches/tswast-patch-1/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))
+              .setFormat(Option.FORMAT.getString(optionMap))
               .execute()
               .getTranslations();
       return Lists.transform(
diff --git a/branches/tswast-patch-1/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/TranslateRpc.java b/branches/tswast-patch-1/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/branches/tswast-patch-1/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java b/branches/tswast-patch-1/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();
   }
 
