Merge branch 'master' into language-script

datastore/cloud-client/src/test/java/com/example/datastore/QuickstartSampleIT.java

@@ -69,4 +69,3 @@ public void testQuickstart() throws Exception {
     assertThat(got).contains("Saved sampletask1: Buy milk");
   }
 }
-// [END datastore_quickstart]

language/cloud-client/README.md

@@ -0,0 +1,30 @@
+# Getting Started with Google Cloud Natural Language API and the Google Cloud Client libraries
+
+[Google Cloud Natural Language API][language] provides natural language
+understanding technologies to developers, including sentiment analysis, entity
+recognition, and syntax analysis. This API is part of the larger collection of
+Cloud Machine Learning APIs.
+
+These sample Java applications demonstrate how to access the Cloud Natural
+Language API using the [Google Cloud Client Library for Java][google-cloud-java].
+
+[language]: https://cloud.google.com/natural-language/docs/
+[google-cloud-java]: https://github.com/GoogleCloudPlatform/google-cloud-java
+
+## Quickstart
+
+Install [Maven](http://maven.apache.org/).
+
+Build your project with:
+
+	mvn clean package -DskipTests
+
+You can then run a given `ClassName` via:
+
+	mvn exec:java -Dexec.mainClass=com.example.language.ClassName \
+	    -DpropertyName=propertyValue \
+		-Dexec.args="arg1 'arg 2' arg3"
+
+### Analyze a string for sentiment (using the quickstart sample)
+
+    mvn exec:java -Dexec.mainClass=com.example.language.QuickstartSample

language/cloud-client/pom.xml

@@ -0,0 +1,57 @@
+<!--
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example.language</groupId>
+  <artifactId>language-google-cloud-samples</artifactId>
+  <packaging>jar</packaging>
+
+  <!-- Parent defines config for testing & linting. -->
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-language</artifactId>
+      <version>0.7.0</version>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.30</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

language/cloud-client/src/main/java/com/example/language/QuickstartSample.java

@@ -0,0 +1,44 @@
+/*
+  Copyright 2016, Google, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+package com.example.language;
+
+// [START language_quickstart]
+// Imports the Google Cloud client library
+import com.google.cloud.language.spi.v1.LanguageServiceClient;
+
+import com.google.cloud.language.v1.Document;
+import com.google.cloud.language.v1.Document.Type;
+import com.google.cloud.language.v1.Sentiment;
+
+public class QuickstartSample {
+  public static void main(String... args) throws Exception {
+    // Instantiates a client
+    LanguageServiceClient language = LanguageServiceClient.create();
+
+    // The text to analyze
+    String text = "Hello, world!";
+    Document doc = Document.newBuilder()
+            .setContent(text).setType(Type.PLAIN_TEXT).build();
+
+    // Detects the sentiment of the text
+    Sentiment sentiment = language.analyzeSentiment(doc).getDocumentSentiment();
+
+    System.out.printf("Text: %s%n", text);
+    System.out.printf("Sentiment: %s, %s%n", sentiment.getScore(), sentiment.getMagnitude());
+  }
+}
+// [END language_quickstart]

language/cloud-client/src/test/java/com/example/language/QuickstartSampleIT.java

@@ -0,0 +1,61 @@
+/*
+  Copyright 2016, Google, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+package com.example.language;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+/**
+ * Tests for quickstart sample.
+ */
+@RunWith(JUnit4.class)
+@SuppressWarnings("checkstyle:abbreviationaswordinname")
+public class QuickstartSampleIT {
+  private ByteArrayOutputStream bout;
+  private PrintStream out;
+
+  @Before
+  public void setUp() {
+    bout = new ByteArrayOutputStream();
+    out = new PrintStream(bout);
+    System.setOut(out);
+  }
+
+  @After
+  public void tearDown() {
+    System.setOut(null);
+  }
+
+  @Test
+  public void testQuickstart() throws Exception {
+    // Act
+    QuickstartSample.main();
+
+    // Assert
+    String got = bout.toString();
+    assertThat(got).contains("Text: Hello, world!");
+    assertThat(got).contains("Sentiment: ");
+  }
+}

pubsub/cloud-client/src/test/java/com/example/pubsub/QuickstartSampleIT.java

@@ -66,4 +66,3 @@ public void testQuickstart() throws Exception {
     assertThat(got).contains("Topic my-new-topic created.");
   }
 }
-// [END datastore_quickstart]

storage/cloud-client/src/test/java/com/example/storage/QuickstartSampleIT.java

@@ -67,4 +67,3 @@ public void testQuickstart() throws Exception {
     assertThat(got).contains(String.format("Bucket %s created.", bucketName));
   }
 }
-// [END datastore_quickstart]

translate/cloud-client/README.md

@@ -2,7 +2,7 @@
 
 [Google Translate API][translate] provides a simple programmatic interface for translating an
 arbitrary string into any supported language.
-These sample Java applications demonstrate how to access the Cloud Storage API using
+These sample Java applications demonstrate how to access the Google Translate API using
 the [Google Cloud Client Library for Java][google-cloud-java].
 
 [translate]: https://cloud.google.com/translate/
@@ -24,5 +24,4 @@ You can then run a given `ClassName` via:
 
 ### Translate a string (using the quickstart sample)
 
-    mvn exec:java -Dexec.mainClass=com.example.translate.QuickstartSample \
-        -Dexec.args="YOUR_API_KEY"
+    mvn exec:java -Dexec.mainClass=com.example.translate.QuickstartSample

translate/cloud-client/src/test/java/com/example/translate/QuickstartSampleIT.java

@@ -59,4 +59,3 @@ public void testQuickstart() throws Exception {
     assertThat(got).contains("Translation: ");
   }
 }
-// [END datastore_quickstart]

vision/text/pom.xml

@@ -50,12 +50,6 @@
       <artifactId>guava</artifactId>
       <version>20.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <version>1.3</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.opennlp</groupId>
       <artifactId>opennlp-tools</artifactId>

vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import com.google.api.services.vision.v1.model.EntityAnnotation;
 import com.google.api.services.vision.v1.model.Status;
-import com.google.auto.value.AutoValue;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -28,28 +27,58 @@
 /**
  * A data object for mapping text to file paths.
  */
-@AutoValue
-abstract class ImageText {
+public class ImageText {
+  private Path pth;
+  private List<EntityAnnotation> ts;
+  private Status err;
 
   public static Builder builder() {
-    return new AutoValue_ImageText.Builder();
+    return new Builder();
   }
 
-  public abstract Path path();
+  private ImageText() {}
 
-  public abstract List<EntityAnnotation> textAnnotations();
+  public Path path() {
+    return this.pth;
+  }
+
+  public List<EntityAnnotation> textAnnotations() {
+    return this.ts;
+  }
 
   @Nullable
-  public abstract Status error();
+  public Status error() {
+    return this.err;
+  }
+
+  public static class Builder {
+    private Path pth;
+    private List<EntityAnnotation> ts;
+    private Status err;
+
+    Builder() {}
 
-  @AutoValue.Builder
-  public abstract static class Builder {
-    public abstract Builder path(Path path);
+    public Builder path(Path path) {
+      this.pth = path;
+      return this;
+    }
 
-    public abstract Builder textAnnotations(List<EntityAnnotation> ts);
+    public Builder textAnnotations(List<EntityAnnotation> ts) {
+      this.ts = ts;
+      return this;
+    }
 
-    public abstract Builder error(@Nullable Status err);
+    public Builder error(@Nullable Status err) {
+      this.err = err;
+      return this;
+    }
 
-    public abstract ImageText build();
+    public ImageText build() {
+      ImageText out = new ImageText();
+      out.pth = this.pth;
+      out.ts = this.ts;
+      out.err = this.err;
+      return out;
+    }
   }
 }

vision/text/src/main/java/com/google/cloud/vision/samples/text/Index.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.