Merge branch 'master' of https://github.com/GoogleCloudPlatform/java-docs-samples into tran15

Author: gguuss

appengine/firebase-tictactoe/README.md

@@ -27,6 +27,7 @@ for realtime notifications when the board changes.
 [sdk]: https://cloud.google.com/sdk
 [creds]: https://console.firebase.google.com/iam-admin/serviceaccounts/project?project=_&consoleReturnUrl=https:%2F%2Fconsole.firebase.google.com%2Fproject%2F_%2Fsettings%2Fgeneral%2F
 [fb-overview]: https://console.firebase.google.com/project/_/overview
+[maven]: https://maven.apache.org
 
 
 ## Run the sample

language/analysis/README.md

@@ -34,7 +34,7 @@ three values `entities`, `sentiment` or `syntax`.
 
 ```
 MAIN_CLASS=com.google.cloud.language.samples.Analyze
-JAR_FILE=target/language-entities-1.0-SNAPSHOT-jar-with-dependencies.jar
+JAR_FILE=target/language-entities-1.0-jar-with-dependencies.jar
 java -cp $JAR_FILE $MAIN_CLASS <sentiment|entities|syntax> <text>
 ```
 

language/analysis/pom.xml

@@ -16,28 +16,21 @@ limitations under the License.
 <project>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <groupId>com.google.cloud.language.samples</groupId>
   <artifactId>language-entities</artifactId>
 
-  <repositories>
-    <repository>
-      <id>project.local</id>
-      <name>project</name>
-      <url>file://${project.basedir}/repo</url>
-    </repository>
-  </repositories>
   <dependencies>
     <!-- [START dependencies] -->
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-language</artifactId>
-      <version>v1-rev20161103-1.22.0-SNAPSHOT</version>
+      <version>v1-rev1-1.21.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
-      <version>1.22.0</version>
+      <version>1.21.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

language/analysis/repo/com/google/apis/google-api-services-language/maven-metadata.xml

@@ -76,7 +76,7 @@ public class AnalyzeIT {
 
     // Assert
     assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
-    assertThat((double)sentiment.getPolarity()).isLessThan(0.0);
+    assertThat((double)sentiment.getScore()).isLessThan(0.0);
   }
 
   @Test public void analyzeSyntax_partOfSpeech() throws Exception {

language/analysis/repo/com/google/apis/google-api-services-language/v1-rev20161109-1.22.0-SNAPSHOT/google-api-services-language-v1-rev20161109-1.22.0-20161110.231925-1.jar

@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-translate</artifactId>
-      <version>0.5.1</version>
+      <version>0.6.0</version>
     </dependency>
 
     <!-- Test dependencies -->

language/analysis/repo/com/google/apis/google-api-services-language/v1-rev20161109-1.22.0-SNAPSHOT/google-api-services-language-v1-rev20161109-1.22.0-20161110.231925-1.pom

@@ -61,13 +61,14 @@ public static void translateText(String sourceText, PrintStream out) {
 
   /**
    * Translate the source text from source to target language.
+   * Make sure that your project is whitelisted. 
    *
    * @param sourceText source text to be translated
    * @param sourceLang source language of the text
    * @param targetLang target language of translated text
    * @param out print stream
    */
-  public static void translateTextWithOptions(
+  public static void translateTextWithOptionsAndModel(
       String sourceText,
       String sourceLang,
       String targetLang,
@@ -77,14 +78,38 @@ public static void translateTextWithOptions(
     TranslateOption srcLang = TranslateOption.sourceLanguage(sourceLang);
     TranslateOption tgtLang = TranslateOption.targetLanguage(targetLang);
 
-    //Use translate `model` parameter with `base` and `nmt` options
+    // Use translate `model` parameter with `base` and `nmt` options.
     TranslateOption model = TranslateOption.model("base");
 
     Translation translation = translate.translate(sourceText, srcLang, tgtLang, model);
     out.printf("Source Text:\n\tLang: %s, Text: %s\n", sourceLang, sourceText);
     out.printf("TranslatedText:\n\tLang: %s, Text: %s\n", targetLang, translation.getTranslatedText());
   }
 
+
+  /**
+   * Translate the source text from source to target language.
+   *
+   * @param sourceText source text to be translated
+   * @param sourceLang source language of the text
+   * @param targetLang target language of translated text
+   * @param out print stream
+   */
+  public static void translateTextWithOptions(
+      String sourceText,
+      String sourceLang,
+      String targetLang,
+      PrintStream out) {
+
+    Translate translate = createTranslateService();
+    TranslateOption srcLang = TranslateOption.sourceLanguage(sourceLang);
+    TranslateOption tgtLang = TranslateOption.targetLanguage(targetLang);
+
+    Translation translation = translate.translate(sourceText, srcLang, tgtLang);
+    out.printf("Source Text:\n\tLang: %s, Text: %s\n", sourceLang, sourceText);
+    out.printf("TranslatedText:\n\tLang: %s, Text: %s\n", targetLang, translation.translatedText());
+  }
+
   /**
    * Displays a list of supported languages and codes.
    *