samples: updates samples to v1 (#425)

GoogleCloudPlatform · Nov 15, 2022 · e244a38 · e244a38
1 parent c7326b9
commit e244a38
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 41 deletions.
diff --git a/...tai/v1beta3/BatchProcessDocumentBeta.java → ...a/documentai/v1/BatchProcessDocument.java b/...tai/v1beta3/BatchProcessDocumentBeta.java → ...a/documentai/v1/BatchProcessDocument.java
@@ -14,17 +14,22 @@
  * limitations under the License.
  */
 
-package documentai.v1beta3;
+package documentai.v1;
 
 // [START documentai_batch_process_document]
 
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.Page;
-import com.google.cloud.documentai.v1beta3.BatchProcessMetadata;
-import com.google.cloud.documentai.v1beta3.BatchProcessRequest;
-import com.google.cloud.documentai.v1beta3.BatchProcessResponse;
-import com.google.cloud.documentai.v1beta3.Document;
-import com.google.cloud.documentai.v1beta3.DocumentProcessorServiceClient;
+import com.google.cloud.documentai.v1.BatchDocumentsInputConfig;
+import com.google.cloud.documentai.v1.BatchProcessMetadata;
+import com.google.cloud.documentai.v1.BatchProcessRequest;
+import com.google.cloud.documentai.v1.BatchProcessResponse;
+import com.google.cloud.documentai.v1.Document;
+import com.google.cloud.documentai.v1.DocumentOutputConfig;
+import com.google.cloud.documentai.v1.DocumentOutputConfig.GcsOutputConfig;
+import com.google.cloud.documentai.v1.DocumentProcessorServiceClient;
+import com.google.cloud.documentai.v1.GcsDocument;
+import com.google.cloud.documentai.v1.GcsDocuments;
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.BlobId;
 import com.google.cloud.storage.Bucket;
@@ -39,7 +44,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-public class BatchProcessDocumentBeta {
+public class BatchProcessDocument {
   public static void batchProcessDocument()
       throws IOException, InterruptedException, TimeoutException, ExecutionException {
     // TODO(developer): Replace these variables before running the sample.
@@ -71,22 +76,26 @@ public static void batchProcessDocument(
       String name =
           String.format("projects/%s/locations/%s/processors/%s", projectId, location, processorId);
 
-      BatchProcessRequest.BatchInputConfig batchInputConfig =
-          BatchProcessRequest.BatchInputConfig.newBuilder()
-              .setGcsSource(gcsInputUri)
-              .setMimeType("application/pdf")
-              .build();
+      GcsDocument gcsDocument =
+          GcsDocument.newBuilder().setGcsUri(gcsInputUri).setMimeType("application/pdf").build();
+
+      GcsDocuments gcsDocuments = GcsDocuments.newBuilder().addDocuments(gcsDocument).build();
+
+      BatchDocumentsInputConfig inputConfig =
+          BatchDocumentsInputConfig.newBuilder().setGcsDocuments(gcsDocuments).build();
 
       String fullGcsPath = String.format("gs://%s/%s/", gcsOutputBucketName, gcsOutputUriPrefix);
-      BatchProcessRequest.BatchOutputConfig outputConfig =
-          BatchProcessRequest.BatchOutputConfig.newBuilder().setGcsDestination(fullGcsPath).build();
+      GcsOutputConfig gcsOutputConfig = GcsOutputConfig.newBuilder().setGcsUri(fullGcsPath).build();
+
+      DocumentOutputConfig documentOutputConfig =
+          DocumentOutputConfig.newBuilder().setGcsOutputConfig(gcsOutputConfig).build();
 
       // Configure the batch process request.
       BatchProcessRequest request =
           BatchProcessRequest.newBuilder()
               .setName(name)
-              .addInputConfigs(batchInputConfig)
-              .setOutputConfig(outputConfig)
+              .setInputDocuments(inputConfig)
+              .setDocumentOutputConfig(documentOutputConfig)
               .build();
 
       OperationFuture<BatchProcessResponse, BatchProcessMetadata> future =

diff --git a/...cumentai/v1beta3/ProcessDocumentBeta.java → ...n/java/documentai/v1/ProcessDocument.java b/...cumentai/v1beta3/ProcessDocumentBeta.java → ...n/java/documentai/v1/ProcessDocument.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package documentai.v1beta3;
+package documentai.v1;
 
 // [START documentai_process_document]
 
-import com.google.cloud.documentai.v1beta3.Document;
-import com.google.cloud.documentai.v1beta3.DocumentProcessorServiceClient;
-import com.google.cloud.documentai.v1beta3.ProcessRequest;
-import com.google.cloud.documentai.v1beta3.ProcessResponse;
+import com.google.cloud.documentai.v1.Document;
+import com.google.cloud.documentai.v1.DocumentProcessorServiceClient;
+import com.google.cloud.documentai.v1.ProcessRequest;
+import com.google.cloud.documentai.v1.ProcessResponse;
+import com.google.cloud.documentai.v1.RawDocument;
 import com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -30,7 +31,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
-public class ProcessDocumentBeta {
+public class ProcessDocument {
   public static void processDocument()
       throws IOException, InterruptedException, ExecutionException, TimeoutException {
     // TODO(developer): Replace these variables before running the sample.
@@ -60,12 +61,12 @@ public static void processDocument(
       // Convert the image data to a Buffer and base64 encode it.
       ByteString content = ByteString.copyFrom(imageFileData);
 
-      Document document =
-          Document.newBuilder().setContent(content).setMimeType("application/pdf").build();
+      RawDocument document =
+          RawDocument.newBuilder().setContent(content).setMimeType("application/pdf").build();
 
       // Configure the process request.
       ProcessRequest request =
-          ProcessRequest.newBuilder().setName(name).setDocument(document).build();
+          ProcessRequest.newBuilder().setName(name).setRawDocument(document).build();
 
       // Recognizes text entities in the PDF document
       ProcessResponse result = client.processDocument(request);

diff --git a/...n/java/documentai/v1beta3/QuickStart.java → ...c/main/java/documentai/v1/QuickStart.java b/...n/java/documentai/v1beta3/QuickStart.java → ...c/main/java/documentai/v1/QuickStart.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package documentai.v1beta3;
+package documentai.v1;
 
 // [START documentai_quickstart]
-
-import com.google.cloud.documentai.v1beta3.Document;
-import com.google.cloud.documentai.v1beta3.DocumentProcessorServiceClient;
-import com.google.cloud.documentai.v1beta3.ProcessRequest;
-import com.google.cloud.documentai.v1beta3.ProcessResponse;
+import com.google.cloud.documentai.v1.Document;
+import com.google.cloud.documentai.v1.DocumentProcessorServiceClient;
+import com.google.cloud.documentai.v1.ProcessRequest;
+import com.google.cloud.documentai.v1.ProcessResponse;
+import com.google.cloud.documentai.v1.RawDocument;
 import com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -31,7 +31,7 @@
 import java.util.concurrent.TimeoutException;
 
 public class QuickStart {
-  public static void quickStart()
+  public static void main(String[] args)
       throws IOException, InterruptedException, ExecutionException, TimeoutException {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "your-project-id";
@@ -60,12 +60,12 @@ public static void quickStart(
       // Convert the image data to a Buffer and base64 encode it.
       ByteString content = ByteString.copyFrom(imageFileData);
 
-      Document document =
-          Document.newBuilder().setContent(content).setMimeType("application/pdf").build();
+      RawDocument document =
+          RawDocument.newBuilder().setContent(content).setMimeType("application/pdf").build();
 
       // Configure the process request.
       ProcessRequest request =
-          ProcessRequest.newBuilder().setName(name).setDocument(document).build();
+          ProcessRequest.newBuilder().setName(name).setRawDocument(document).build();
 
       // Recognizes text entities in the PDF document
       ProcessResponse result = client.processDocument(request);

diff --git a/...v1beta3/BatchProcessDocumentBetaTest.java → ...cumentai/v1/BatchProcessDocumentTest.java b/...v1beta3/BatchProcessDocumentBetaTest.java → ...cumentai/v1/BatchProcessDocumentTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package documentai.v1beta3;
+package documentai.v1;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertNotNull;
@@ -34,7 +34,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class BatchProcessDocumentBetaTest {
+public class BatchProcessDocumentTest {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String PROCESSOR_ID = "88541adc6eeec481";
   private static final String BUCKET_NAME =
@@ -99,7 +99,7 @@ public void setUp() {
   public void testBatchProcessDocument()
       throws InterruptedException, ExecutionException, TimeoutException, IOException {
     // parse the GCS invoice as a form.
-    BatchProcessDocumentBeta.batchProcessDocument(
+    BatchProcessDocument.batchProcessDocument(
         PROJECT_ID, "us", PROCESSOR_ID, INPUT_URI, OUTPUT_BUCKET_NAME, OUTPUT_PREFIX);
     String got = bout.toString();
 

diff --git a/...cumentai/v1beta3/ProcessDocumentTest.java → ...va/documentai/v1/ProcessDocumentTest.java b/...cumentai/v1beta3/ProcessDocumentTest.java → ...va/documentai/v1/ProcessDocumentTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package documentai.v1beta3;
+package documentai.v1;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertNotNull;
@@ -61,7 +61,7 @@ public void setUp() {
   public void testProcessDocument()
       throws InterruptedException, ExecutionException, IOException, TimeoutException {
     // parse the GCS invoice as a form.
-    ProcessDocumentBeta.processDocument(PROJECT_ID, "us", PROCESSOR_ID, FILE_PATH);
+    ProcessDocument.processDocument(PROJECT_ID, "us", PROCESSOR_ID, FILE_PATH);
     String got = bout.toString();
 
     assertThat(got).contains("Paragraph text:");

diff --git a/...va/documentai/v1beta3/QuickStartTest.java → ...st/java/documentai/v1/QuickStartTest.java b/...va/documentai/v1beta3/QuickStartTest.java → ...st/java/documentai/v1/QuickStartTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package documentai.v1beta3;
+package documentai.v1;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertNotNull;