---

mziccard · mziccard · commit f438aa7217e1 · 2016-11-14T19:42:00.000+01:00
yaml --- r: 5219 b: refs/heads/master c: 9eb9195 h: refs/heads/master i: 5217: 097c428 5215: 7ad44a7
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 60270261fa763131f6cd6b9aacfc7819e0af1c3d
+refs/heads/master: 9eb91951d4201b3c0d8453b4d308a891e59d7d91
 refs/heads/travis: dae77e558b884bc1b165155482d76c8e40b0fca4
 refs/heads/gh-pages: c2885dba4ca5fa546ec268ea30687d296281695c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/README.md b/trunk/README.md
@@ -610,10 +610,9 @@ Google Translate
 #### Preview
 
 Here's a snippet showing a simple usage example. The example shows how to detect the language of
-some text and how to translate some text. The example assumes that either default application
-credentials or a valid api key are available. An api key stored in the `GOOGLE_API_KEY` environment
-variable will be automatically detected. Alternatively, you can use the `apiKey(String)` setter in
-`TranslateOptions.Builder`. Complete source code can be found at
+some text and how to translate some text. The example assumes that the `GOOGLE_API_KEY` is set and
+contains a valid API key. Alternatively, you can use the `apiKey(String)` setter in
+`TranslateOptions.Builder` to set the API key. Complete source code can be found at
 [DetectLanguageAndTranslate.java](./google-cloud-examples/src/main/java/com/google/cloud/examples/translate/snippets/DetectLanguageAndTranslate.java).
 
 ```java
diff --git a/trunk/google-cloud-bigquery/pom.xml b/trunk/google-cloud-bigquery/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-bigquery</site.installationModule>
diff --git a/trunk/google-cloud-compute/pom.xml b/trunk/google-cloud-compute/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-compute</site.installationModule>
diff --git a/trunk/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/trunk/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-contrib</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-nio-examples</site.installationModule>
diff --git a/trunk/google-cloud-contrib/google-cloud-nio/pom.xml b/trunk/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-contrib</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-nio</site.installationModule>
diff --git a/trunk/google-cloud-contrib/pom.xml b/trunk/google-cloud-contrib/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-contrib</site.installationModule>
diff --git a/trunk/google-cloud-core/pom.xml b/trunk/google-cloud-core/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-core</site.installationModule>
diff --git a/trunk/google-cloud-datastore/pom.xml b/trunk/google-cloud-datastore/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-datastore</site.installationModule>
diff --git a/trunk/google-cloud-dns/pom.xml b/trunk/google-cloud-dns/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-dns</site.installationModule>
diff --git a/trunk/google-cloud-errorreporting/pom.xml b/trunk/google-cloud-errorreporting/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-errorreporting</site.installationModule>
diff --git a/trunk/google-cloud-examples/pom.xml b/trunk/google-cloud-examples/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-examples</site.installationModule>
diff --git a/trunk/google-cloud-examples/src/main/java/com/google/cloud/examples/translate/snippets/DetectLanguageAndTranslate.java b/trunk/google-cloud-examples/src/main/java/com/google/cloud/examples/translate/snippets/DetectLanguageAndTranslate.java
@@ -36,8 +36,7 @@ public class DetectLanguageAndTranslate {
 
   public static void main(String... args) {
     // Create a service object
-    // Default application credentials or an API key from the GOOGLE_API_KEY environment variable
-    // are used to authenticate requests
+    // API key is read from the GOOGLE_API_KEY environment variable
     Translate translate = TranslateOptions.getDefaultInstance().getService();
 
     // Detect the language of some text
diff --git a/trunk/google-cloud-language/pom.xml b/trunk/google-cloud-language/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-language</site.installationModule>
diff --git a/trunk/google-cloud-logging/pom.xml b/trunk/google-cloud-logging/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-logging</site.installationModule>
diff --git a/trunk/google-cloud-monitoring/pom.xml b/trunk/google-cloud-monitoring/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-monitoring</site.installationModule>
diff --git a/trunk/google-cloud-pubsub/pom.xml b/trunk/google-cloud-pubsub/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-pubsub</site.installationModule>
diff --git a/trunk/google-cloud-resourcemanager/pom.xml b/trunk/google-cloud-resourcemanager/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-resourcemanager</site.installationModule>
diff --git a/trunk/google-cloud-speech/pom.xml b/trunk/google-cloud-speech/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-speech</site.installationModule>
diff --git a/trunk/google-cloud-storage/pom.xml b/trunk/google-cloud-storage/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-storage</site.installationModule>
diff --git a/trunk/google-cloud-trace/pom.xml b/trunk/google-cloud-trace/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-trace</site.installationModule>
diff --git a/trunk/google-cloud-translate/README.md b/trunk/google-cloud-translate/README.md
@@ -64,25 +64,20 @@ Getting Started
 ---------------
 #### Prerequisites
 For this tutorial, you need a [Google Developers Console](https://console.developers.google.com/)
-project with "Translate API" enabled via the console's API Manager. You also need to enable
-billing via the [Google Developers Console](https://console.developers.google.com/).
-
-Finally, you must set up the local development environment by
-[installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following command
-in command line: `gcloud auth application-default login`. Alternatively, you can authenticate
-Translate requests using an API key. See
-[Translate quickstart](https://cloud.google.com/translate/v2/quickstart) for more details.
+project with "Translate API" enabled via the console's API Manager. You will also need a to enable
+billing via the [Google Developers Console](https://console.developers.google.com/) project and to
+retrieve an API key. See [Translate quickstart](https://cloud.google.com/translate/v2/quickstart)
+for more details.
 
 #### Installation and setup
 You'll need to obtain the `google-cloud-translate` library. See the [Quickstart](#quickstart)
 section to add `google-cloud-translate` as a dependency in your code.
 
 #### Creating an authorized service object
-To make authenticated requests to Google Translate, you must create a service object with
-credentials or with an API key. The simplest way to authenticate is to use
-[Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials).
-These credentials are automatically inferred from your environment, so you only need the following
-code to create your service object:
+To make authenticated requests to Google Translates, you must create a service object with an API
+key. By default, API key is looked for in the `GOOGLE_API_KEY` environment variable. Once the API
+key is set, you can make API calls by invoking methods on the Translate service object. To create a
+service object, given that `GOOGLE_API_KEY` is set, use the following code:
 
 ```java
 import com.google.cloud.translate.Translate;
@@ -91,11 +86,7 @@ import com.google.cloud.translate.TranslateOptions;
 Translate translate = TranslateOptions.getDefaultInstance().getService();
 ```
 
-Notice that this code can be also used with an API key. By default, an API key is looked for in the
-`GOOGLE_API_KEY` environment variable. Once the API key is set, you can make API calls by invoking
-methods on the Translate service created via `TranslateOptions.getDefaultInstance().getService()`.
-
-You can also explicitly set the API key as follows:
+Or you can explicitly set the API key as follows:
 ```java
 Translate translate = TranslateOptions.newBuilder().setApiKey("myKey").getService();
 ```
@@ -140,8 +131,8 @@ Translation translation = translate.translate(
 
 In
 [DetectLanguageAndTranslate.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/translate/snippets/DetectLanguageAndTranslate.java)
-we put together all the code shown above into one program. The program assumes that either default
-application credentials or a valid api key are available.
+we put together all the code shown above into one program. The program assumes that a valid api key
+is available.
 
 Troubleshooting
 ---------------
diff --git a/trunk/google-cloud-translate/pom.xml b/trunk/google-cloud-translate/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-translate</site.installationModule>
diff --git a/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java b/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java
@@ -81,19 +81,6 @@ public static TranslateOption sourceLanguage(String sourceLanguage) {
     public static TranslateOption targetLanguage(String targetLanguage) {
       return new TranslateOption(TranslateRpc.Option.TARGET_LANGUAGE, targetLanguage);
     }
-
-    /**
-     * Sets the language translation model. You can use this parameter to take advantage of Neural
-     * 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 translation will fail.
-     *
-     * @param model the language translation model
-     */
-    public static TranslateOption model(String model) {
-      return new TranslateOption(TranslateRpc.Option.MODEL, model);
-    }
   }
 
   /**
@@ -183,8 +170,6 @@ 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);
 
@@ -204,8 +189,6 @@ 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/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java b/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java
@@ -30,17 +30,14 @@
 
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import java.util.Set;
 
 public class TranslateOptions extends
     HttpServiceOptions<Translate, TranslateRpc, TranslateOptions> {
 
   private static final long serialVersionUID = -572597134540398216L;
-  private static final String DEFAULT_HOST = "https://translation.googleapis.com";
   private static final String API_KEY_ENV_NAME = "GOOGLE_API_KEY";
-  private static final Set<String> SCOPES =
-      ImmutableSet.of("https://www.googleapis.com/auth/cloud-platform");
+  private static final Set<String> SCOPES = ImmutableSet.of();
 
   private final String apiKey;
   private final String targetLanguage;
@@ -100,6 +97,17 @@ public Builder setProjectId(String projectId) {
       return self();
     }
 
+    /**
+     * Sets the service authentication credentials. Setting credentials has no impact on the
+     * {@link Translate} service.
+     *
+     * @return the builder
+     */
+    public Builder setCredentials(Credentials credentials) {
+      super.setCredentials(credentials);
+      return self();
+    }
+
     /**
      * Sets the API key used to issue requets. If not set, the API key is looked for in the
      * {@code GOOGLE_API_KEY} environment variable. For instructions on how to get an API key see
@@ -150,13 +158,18 @@ public Builder setTargetLanguage(String targetLanguage) {
 
     @Override
     public TranslateOptions build() {
+      // Auth credentials are not used by Translate
+      setCredentials(NoCredentials.getInstance());
       return new TranslateOptions(this);
     }
   }
 
   private TranslateOptions(Builder builder) {
     super(TranslateFactory.class, TranslateRpcFactory.class, builder);
     this.apiKey = builder.apiKey != null ? builder.apiKey : getDefaultApiKey();
+    checkArgument(this.apiKey != null,
+        "An API key is required for this service but could not be determined from the builder "
+            + "or the environment. Please set an API key using the builder.");
     this.targetLanguage = firstNonNull(builder.targetLanguage, Locale.ENGLISH.getLanguage());
   }
 
@@ -180,11 +193,6 @@ protected Set<String> getScopes() {
     return SCOPES;
   }
 
-  @Override
-  protected String getDefaultHost() {
-    return DEFAULT_HOST;
-  }
-
   @Deprecated
   protected String defaultApiKey() {
     return getDefaultApiKey();
@@ -242,8 +250,8 @@ public boolean equals(Object obj) {
     }
     TranslateOptions options = (TranslateOptions) obj;
     return baseEquals(options)
-        && Objects.equals(apiKey, options.apiKey)
-        && Objects.equals(targetLanguage, options.targetLanguage);
+        && apiKey.equals(options.apiKey)
+        && targetLanguage.equals(options.targetLanguage);
   }
 
   /**
diff --git a/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/Translation.java b/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/Translation.java
diff --git a/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/DefaultTranslateRpc.java b/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/DefaultTranslateRpc.java
diff --git a/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/TranslateRpc.java b/trunk/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/TranslateRpc.java
diff --git a/trunk/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java b/trunk/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java
diff --git a/trunk/google-cloud-translate/src/test/java/com/google/cloud/translate/it/ITTranslateTest.java b/trunk/google-cloud-translate/src/test/java/com/google/cloud/translate/it/ITTranslateTest.java
diff --git a/trunk/google-cloud-vision/pom.xml b/trunk/google-cloud-vision/pom.xml
diff --git a/trunk/google-cloud/pom.xml b/trunk/google-cloud/pom.xml
diff --git a/trunk/pom.xml b/trunk/pom.xml
