Merge branch 'master' into master

Author: dzlier-gcp

.gitignore

@@ -24,6 +24,7 @@ pom.xml.next
 release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
+.checkstyle
 
 # Secrets
 service-account.json

appengine-java8/guestbook-cloud-datastore/pom.xml

@@ -90,7 +90,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-testing</artifactId>
-      <version>1.9.76</version>
+      <version>1.9.77</version>
       <scope>test</scope>
     </dependency>
     <dependency>

appengine-java8/guestbook-objectify/pom.xml

@@ -89,7 +89,7 @@
       <dependency>
           <groupId>com.google.appengine</groupId>
           <artifactId>appengine-testing</artifactId>
-          <version>1.9.76</version>
+          <version>1.9.77</version>
           <scope>test</scope>
       </dependency>
       <dependency>

appengine-java8/multitenancy/pom.xml

@@ -88,7 +88,7 @@
     <dependency>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-testing</artifactId>
-        <version>1.9.76</version>
+        <version>1.9.77</version>
         <scope>test</scope>
     </dependency>
     <dependency>

appengine-java8/taskqueues-pull/pom.xml

@@ -62,7 +62,7 @@ Copyright 2016 Google Inc.
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-testing</artifactId>
-            <version>1.9.76</version>
+            <version>1.9.77</version>
             <scope>test</scope>
         </dependency>
         <dependency>

appengine-java8/users/pom.xml

@@ -78,7 +78,7 @@ Copyright 2015 Google Inc.
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-testing</artifactId>
-      <version>1.9.76</version>
+      <version>1.9.77</version>
       <scope>test</scope>
     </dependency>
     <dependency>

automl/cloud-client/README.md

@@ -63,6 +63,8 @@ small section of code to print out the `metadata` field.
 * [Deploy Model](src/main/java/com/example/automl/DeployModel.java) - Not supported by Translation
 * [Uneploy Model](src/main/java/com/example/automl/UndeployModel.java) - Not supported by Translation
 
+### Batch Prediction
+* [Batch Predict](src/main/java/com/example/automl/BatchPredict.java) - Supported by: Natural Language Entity Extraction, Vision Classification, and Vision Object Detection.
 
 ### Operation Management
 * [List Operation Statuses](src/main/java/com/example/automl/ListOperationStatus.java)

automl/cloud-client/src/main/java/com/example/automl/LanguageBatchPredict.java renamed to automl/cloud-client/src/main/java/com/example/automl/BatchPredict.java

@@ -16,7 +16,7 @@
 
 package com.example.automl;
 
-// [START automl_language_batch_predict]
+// [START automl_batch_predict]
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.automl.v1.BatchPredictInputConfig;
 import com.google.cloud.automl.v1.BatchPredictOutputConfig;
@@ -31,19 +31,19 @@
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 
-class LanguageBatchPredict {
+class BatchPredict {
 
   static void batchPredict() throws IOException, ExecutionException, InterruptedException {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "YOUR_PROJECT_ID";
     String modelId = "YOUR_MODEL_ID";
-    String inputUri = "gs://YOUR_BUCKET_ID/path_to_your_input_file.jsonl";
+    String inputUri = "gs://YOUR_BUCKET_ID/path_to_your_input_csv_or_jsonl";
     String outputUri = "gs://YOUR_BUCKET_ID/path_to_save_results/";
     batchPredict(projectId, modelId, inputUri, outputUri);
   }
 
   static void batchPredict(String projectId, String modelId, String inputUri, String outputUri)
-      throws IOException, ExecutionException, InterruptedException {
+          throws IOException, ExecutionException, InterruptedException {
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests. After completing all of your requests, call
     // the "close" method on the client to safely clean up any remaining background resources.
@@ -52,25 +52,27 @@ static void batchPredict(String projectId, String modelId, String inputUri, Stri
       ModelName name = ModelName.of(projectId, "us-central1", modelId);
       GcsSource gcsSource = GcsSource.newBuilder().addInputUris(inputUri).build();
       BatchPredictInputConfig inputConfig =
-          BatchPredictInputConfig.newBuilder().setGcsSource(gcsSource).build();
+              BatchPredictInputConfig.newBuilder().setGcsSource(gcsSource).build();
       GcsDestination gcsDestination =
-          GcsDestination.newBuilder().setOutputUriPrefix(outputUri).build();
+              GcsDestination.newBuilder().setOutputUriPrefix(outputUri).build();
       BatchPredictOutputConfig outputConfig =
-          BatchPredictOutputConfig.newBuilder().setGcsDestination(gcsDestination).build();
+              BatchPredictOutputConfig.newBuilder().setGcsDestination(gcsDestination).build();
       BatchPredictRequest request =
-          BatchPredictRequest.newBuilder()
-              .setName(name.toString())
-              .setInputConfig(inputConfig)
-              .setOutputConfig(outputConfig)
-              .build();
+              BatchPredictRequest.newBuilder()
+                      .setName(name.toString())
+                      .setInputConfig(inputConfig)
+                      .setOutputConfig(outputConfig)
+                      // [0.0-1.0] Only produce results higher than this value
+                      .putParams("score_threshold", "0.8")
+                      .build();
 
       OperationFuture<BatchPredictResult, OperationMetadata> future =
-          client.batchPredictAsync(request);
+              client.batchPredictAsync(request);
 
       System.out.println("Waiting for operation to complete...");
       BatchPredictResult response = future.get();
       System.out.println("Batch Prediction results saved to specified Cloud Storage bucket.");
     }
   }
 }
-// [END automl_language_batch_predict]
+// [END automl_batch_predict]

automl/cloud-client/src/main/java/com/example/automl/VisionBatchPredict.java

@@ -86,7 +86,7 @@ public void testBatchPredict() throws IOException, ExecutionException, Interrupt
     String inputUri = String.format("gs://%s/entity_extraction/input.jsonl", BUCKET_ID);
     String outputUri = String.format("gs://%s/TEST_BATCH_PREDICT/", BUCKET_ID);
     // Act
-    LanguageBatchPredict.batchPredict(PROJECT_ID, modelId, inputUri, outputUri);
+    BatchPredict.batchPredict(PROJECT_ID, modelId, inputUri, outputUri);
 
     // Assert
     String got = bout.toString();

automl/cloud-client/src/test/java/com/example/automl/LanguageEntityExtractionPredictIT.java

@@ -86,7 +86,7 @@ public void testBatchPredict() throws IOException, ExecutionException, Interrupt
     String inputUri = String.format("gs://%s/batch_predict_test.csv", BUCKET_ID);
     String outputUri = String.format("gs://%s/TEST_BATCH_PREDICT/", BUCKET_ID);
     // Act
-    VisionBatchPredict.batchPredict(PROJECT_ID, modelId, inputUri, outputUri);
+    BatchPredict.batchPredict(PROJECT_ID, modelId, inputUri, outputUri);
 
     // Assert
     String got = bout.toString();

automl/cloud-client/src/test/java/com/example/automl/VisionClassificationPredictIT.java

@@ -88,7 +88,7 @@ public void testBatchPredict() throws IOException, ExecutionException, Interrupt
         String.format("gs://%s/vision_object_detection_batch_predict_test.csv", BUCKET_ID);
     String outputUri = String.format("gs://%s/TEST_BATCH_PREDICT/", BUCKET_ID);
     // Act
-    VisionBatchPredict.batchPredict(PROJECT_ID, modelId, inputUri, outputUri);
+    BatchPredict.batchPredict(PROJECT_ID, modelId, inputUri, outputUri);
 
     // Assert
     String got = bout.toString();

automl/cloud-client/src/test/java/com/example/automl/VisionObjectDetectionPredictIT.java

@@ -33,7 +33,6 @@ public static void writeBatch(String projectId, String instanceId, String tableI
 
     try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) {
       long timestamp = System.currentTimeMillis() * 1000;
-      ByteString one = ByteString.copyFrom(new byte[] {0, 0, 0, 0, 0, 0, 0, 1});
 
       BulkMutation bulkMutation =
           BulkMutation.create(tableId)
@@ -44,7 +43,7 @@ public static void writeBatch(String projectId, String instanceId, String tableI
                           COLUMN_FAMILY_NAME,
                           ByteString.copyFrom("connected_wifi".getBytes()),
                           timestamp,
-                          one)
+                          1)
                       .setCell(COLUMN_FAMILY_NAME, "os_build", timestamp, "12155.0.0-rc1"))
               .add(
                   "tablet#a0b81f74#20190502",
@@ -53,7 +52,7 @@ public static void writeBatch(String projectId, String instanceId, String tableI
                           COLUMN_FAMILY_NAME,
                           ByteString.copyFrom("connected_wifi".getBytes()),
                           timestamp,
-                          one)
+                          1)
                       .setCell(COLUMN_FAMILY_NAME, "os_build", timestamp, "12155.0.0-rc6"));
 
       dataClient.bulkMutateRows(bulkMutation);

bigtable/snippets/src/main/java/com/example/bigtable/WriteBatch.java

@@ -34,20 +34,19 @@ public static void writeSimple(String projectId, String instanceId, String table
       long timestamp = System.currentTimeMillis() * 1000;
 
       String rowkey = "phone#4c410523#20190501";
-      ByteString one = ByteString.copyFrom(new byte[] {0, 0, 0, 0, 0, 0, 0, 1});
 
       RowMutation rowMutation =
           RowMutation.create(tableId, rowkey)
               .setCell(
                   COLUMN_FAMILY_NAME,
                   ByteString.copyFrom("connected_cell".getBytes()),
                   timestamp,
-                  one)
+                  1)
               .setCell(
                   COLUMN_FAMILY_NAME,
                   ByteString.copyFrom("connected_wifi".getBytes()),
                   timestamp,
-                  one)
+                  1)
               .setCell(COLUMN_FAMILY_NAME, "os_build", timestamp, "PQ2A.190405.003");
 
       dataClient.mutateRow(rowMutation);

bigtable/snippets/src/main/java/com/example/bigtable/WriteSimple.java

@@ -54,7 +54,7 @@ public static void createEntry(String projectId, String entryGroupId, String ent
               .setDisplayName("My Fileset")
               .setDescription("This fileset consists of ....")
               .setGcsFilesetSpec(
-                  GcsFilesetSpec.newBuilder().addFilePatterns("gs://my_bucket/*").build())
+                  GcsFilesetSpec.newBuilder().addFilePatterns("gs://cloud-samples-data/*").build())
               .setSchema(
                   Schema.newBuilder()
                       .addColumns(