From de5b5a80fb9e42cf698fd101cffd34474eda0ce9 Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Sat, 31 Oct 2020 04:31:40 +0530
Subject: [PATCH] fix: use setModel as rest api already support it (#330)

---
 .../cloud/translate/spi/v2/HttpTranslateRpc.java    |  4 +---
 .../google/cloud/translate/TranslateImplTest.java   | 13 +++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

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
index 3a071715..11c0b85a 100644
--- 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
@@ -98,8 +98,6 @@ public List<LanguagesResource> listSupportedLanguages(Map<Option, ?> optionMap)
   @Override
   public List<TranslationsResource> translate(List<String> texts, Map<Option, ?> optionMap) {
     try {
-      // TODO use POST as soon as usage of "model" correctly reports an error in non-whitelisted
-      // projects
       String targetLanguage =
           firstNonNull(Option.TARGET_LANGUAGE.getString(optionMap), options.getTargetLanguage());
       final String sourceLanguage = Option.SOURCE_LANGUAGE.getString(optionMap);
@@ -109,7 +107,7 @@ public List<TranslationsResource> translate(List<String> texts, Map<Option, ?> o
               .list(texts, targetLanguage)
               .setSource(sourceLanguage)
               .setKey(options.getApiKey())
-              .set("model", Option.MODEL.getString(optionMap))
+              .setModel(Option.MODEL.getString(optionMap))
               .setFormat(Option.FORMAT.getString(optionMap))
               .execute()
               .getTranslations();
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
index 697bb86d..970fe4fe 100644
--- 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
@@ -368,6 +368,19 @@ public void testTranslateListWithOptions() {
     verify();
   }
 
+  @Test
+  public void testTranslateTextListWithModel() {
+    String text = "Hallo Welt!";
+    List<String> texts = ImmutableList.of(text);
+    EasyMock.expect(
+            translateRpcMock.translate(texts, ImmutableMap.of(TranslateRpc.Option.MODEL, "nmt")))
+        .andReturn(ImmutableList.of(TRANSLATION2_PB));
+    EasyMock.replay(translateRpcMock);
+    initializeService();
+    assertEquals(ImmutableList.of(TRANSLATION2), translate.translate(texts, MODEL_OPTION));
+    verify();
+  }
+
   @Test
   public void testRetryableException() {
     EasyMock.expect(translateRpcMock.listSupportedLanguages(EMPTY_RPC_OPTIONS))