Switch back to GET for translate and update docs

mziccard · mziccard · commit de8c21d9f087 · 2016-11-14T14:52:08.000+01: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
@@ -87,7 +87,7 @@ public static TranslateOption targetLanguage(String targetLanguage) {
      * Machine Translation. Possible values are {@code base} and {@code nmt}. Google Translate could
      * use a different model to translate your text, use {@link Translation#getModel()} to know
      * which model was used for translation. Please notice that you must be whitelisted to use this
-     * option, otherwise it will be ignored.
+     * option, otherwise translation will fail.
      *
      * @param model the language translation model
      */
@@ -183,6 +183,8 @@ public static TranslateOption model(String model) {
    * @param texts the texts to translate
    * @return a list of objects containing information on the language translation, one for each
    *     provided text, in order.
+   * @throws TranslateException upon failure or if {@link TranslateOption#model(String)} is used by
+   *     a non-whitelisted user
    */
   List<Translation> translate(List<String> texts, TranslateOption... options);
 
@@ -202,6 +204,8 @@ public static TranslateOption model(String model) {
    *
    * @param text the text to translate
    * @return an object containing information on the language translation
+   * @throws TranslateException upon failure or if {@link TranslateOption#model(String)} is used by
+   *     a non-whitelisted user
    */
   Translation translate(String text, TranslateOption... options);
 }
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/Translation.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/Translation.java
@@ -90,7 +90,7 @@ public String getSourceLanguage() {
    * {@link Translate#translate(List, Translate.TranslateOption...)}.
    *
    * <p>Please notice that you must be whitelisted to use the
-   * {@link Translate.TranslateOption#model(String)} option, otherwise it will be ignored.
+   * {@link Translate.TranslateOption#model(String)} option, otherwise translation will fail.
    */
   public String getModel() {
     return model;
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/DefaultTranslateRpc.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/DefaultTranslateRpc.java
@@ -118,35 +118,18 @@ public List<LanguagesResource> listSupportedLanguages(Map<Option, ?> optionMap)
   @Override
   public List<TranslationsResource> translate(List<String> texts, Map<Option, ?> optionMap) {
     try {
-      final String sourceLanguage = SOURCE_LANGUAGE.getString(optionMap);
-      String model = MODEL.getString(optionMap);
-      ImmutableMap.Builder<String, Object> contentBuilder = ImmutableMap.builder();
-      contentBuilder.put("target",
-          firstNonNull(TARGET_LANGUAGE.getString(optionMap), options.getTargetLanguage()));
-      contentBuilder.put("q", texts);
-      if (sourceLanguage != null) {
-        contentBuilder.put("source", sourceLanguage);
-      }
-      if (model != null) {
-        contentBuilder.put("model", model);
-      }
-      HttpRequest httpRequest = translate.getRequestFactory()
-          .buildPostRequest(buildTargetUrl(""),
-              new JsonHttpContent(translate.getJsonFactory(), contentBuilder.build()))
-          .setParser(translate.getObjectParser());
-      List<TranslationsResource> translations =
-          httpRequest.execute().parseAs(TranslationsListResponse.class).getTranslations();
-      // TODO use REST apiary as soon as it supports POST
-      // String targetLanguage =
-      //     firstNonNull(TARGET_LANGUAGE.getString(optionMap), options.getTargetLanguage());
-      // final String sourceLanguage = SOURCE_LANGUAGE.getString(optionMap);
-      // List<TranslationsResource> translations =
-      //     translate.translations()
-      //         .list(texts, targetLanguage)
-      //         .setSource(sourceLanguage)
-      //         .setKey(options.getApiKey())
-      //         .execute()
-      //         .getTranslations();
+      // TODO use POST as soon as usage of "model" causes error in non-whitelisted projects
+       String targetLanguage =
+           firstNonNull(TARGET_LANGUAGE.getString(optionMap), options.getTargetLanguage());
+       final String sourceLanguage = SOURCE_LANGUAGE.getString(optionMap);
+       List<TranslationsResource> translations =
+           translate.translations()
+               .list(texts, targetLanguage)
+               .setSource(sourceLanguage)
+               .setKey(options.getApiKey())
+               .set("model", MODEL.getString(optionMap))
+               .execute()
+               .getTranslations();
       return Lists.transform(
           translations != null ? translations : ImmutableList.<TranslationsResource>of(),
           new Function<TranslationsResource, TranslationsResource>() {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public String getSourceLanguage() {`
`90`	`90`	`* {@link Translate#translate(List, Translate.TranslateOption...)}.`
`91`	`91`	`*`
`92`	`92`	`* <p>Please notice that you must be whitelisted to use the`
`93`		`- * {@link Translate.TranslateOption#model(String)} option, otherwise it will be ignored.`
	`93`	`+ * {@link Translate.TranslateOption#model(String)} option, otherwise translation will fail.`
`94`	`94`	`*/`
`95`	`95`	`public String getModel() {`
`96`	`96`	`return model;`