Skip to content

Commit cfcaf66

Browse files
telpiriontelpirion
authored
samples: updates samples to v1 (#425)
1 parent e8c209b commit cfcaf66

File tree

6 files changed

+51
-41
lines changed

6 files changed

+51
-41
lines changed

‎document-ai/snippets/src/main/java/documentai/v1beta3/BatchProcessDocumentBeta.java renamed to ‎document-ai/snippets/src/main/java/documentai/v1/BatchProcessDocument.java

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,22 @@
1414
* limitations under the License.
1515
*/
1616

17-
package documentai.v1beta3;
17+
package documentai.v1;
1818

1919
// [START documentai_batch_process_document]
2020

2121
import com.google.api.gax.longrunning.OperationFuture;
2222
import com.google.api.gax.paging.Page;
23-
import com.google.cloud.documentai.v1beta3.BatchProcessMetadata;
24-
import com.google.cloud.documentai.v1beta3.BatchProcessRequest;
25-
import com.google.cloud.documentai.v1beta3.BatchProcessResponse;
26-
import com.google.cloud.documentai.v1beta3.Document;
27-
import com.google.cloud.documentai.v1beta3.DocumentProcessorServiceClient;
23+
import com.google.cloud.documentai.v1.BatchDocumentsInputConfig;
24+
import com.google.cloud.documentai.v1.BatchProcessMetadata;
25+
import com.google.cloud.documentai.v1.BatchProcessRequest;
26+
import com.google.cloud.documentai.v1.BatchProcessResponse;
27+
import com.google.cloud.documentai.v1.Document;
28+
import com.google.cloud.documentai.v1.DocumentOutputConfig;
29+
import com.google.cloud.documentai.v1.DocumentOutputConfig.GcsOutputConfig;
30+
import com.google.cloud.documentai.v1.DocumentProcessorServiceClient;
31+
import com.google.cloud.documentai.v1.GcsDocument;
32+
import com.google.cloud.documentai.v1.GcsDocuments;
2833
import com.google.cloud.storage.Blob;
2934
import com.google.cloud.storage.BlobId;
3035
import com.google.cloud.storage.Bucket;
@@ -39,7 +44,7 @@
3944
import java.util.concurrent.TimeUnit;
4045
import java.util.concurrent.TimeoutException;
4146

42-
public class BatchProcessDocumentBeta {
47+
public class BatchProcessDocument {
4348
public static void batchProcessDocument()
4449
throws IOException, InterruptedException, TimeoutException, ExecutionException {
4550
// TODO(developer): Replace these variables before running the sample.
@@ -71,22 +76,26 @@ public static void batchProcessDocument(
7176
String name =
7277
String.format("projects/%s/locations/%s/processors/%s", projectId, location, processorId);
7378

74-
BatchProcessRequest.BatchInputConfig batchInputConfig =
75-
BatchProcessRequest.BatchInputConfig.newBuilder()
76-
.setGcsSource(gcsInputUri)
77-
.setMimeType("application/pdf")
78-
.build();
79+
GcsDocument gcsDocument =
80+
GcsDocument.newBuilder().setGcsUri(gcsInputUri).setMimeType("application/pdf").build();
81+
82+
GcsDocuments gcsDocuments = GcsDocuments.newBuilder().addDocuments(gcsDocument).build();
83+
84+
BatchDocumentsInputConfig inputConfig =
85+
BatchDocumentsInputConfig.newBuilder().setGcsDocuments(gcsDocuments).build();
7986

8087
String fullGcsPath = String.format("gs://%s/%s/", gcsOutputBucketName, gcsOutputUriPrefix);
81-
BatchProcessRequest.BatchOutputConfig outputConfig =
82-
BatchProcessRequest.BatchOutputConfig.newBuilder().setGcsDestination(fullGcsPath).build();
88+
GcsOutputConfig gcsOutputConfig = GcsOutputConfig.newBuilder().setGcsUri(fullGcsPath).build();
89+
90+
DocumentOutputConfig documentOutputConfig =
91+
DocumentOutputConfig.newBuilder().setGcsOutputConfig(gcsOutputConfig).build();
8392

8493
// Configure the batch process request.
8594
BatchProcessRequest request =
8695
BatchProcessRequest.newBuilder()
8796
.setName(name)
88-
.addInputConfigs(batchInputConfig)
89-
.setOutputConfig(outputConfig)
97+
.setInputDocuments(inputConfig)
98+
.setDocumentOutputConfig(documentOutputConfig)
9099
.build();
91100

92101
OperationFuture<BatchProcessResponse, BatchProcessMetadata> future =

‎document-ai/snippets/src/main/java/documentai/v1beta3/ProcessDocumentBeta.java renamed to ‎document-ai/snippets/src/main/java/documentai/v1/ProcessDocument.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
package documentai.v1beta3;
17+
package documentai.v1;
1818

1919
// [START documentai_process_document]
2020

21-
import com.google.cloud.documentai.v1beta3.Document;
22-
import com.google.cloud.documentai.v1beta3.DocumentProcessorServiceClient;
23-
import com.google.cloud.documentai.v1beta3.ProcessRequest;
24-
import com.google.cloud.documentai.v1beta3.ProcessResponse;
21+
import com.google.cloud.documentai.v1.Document;
22+
import com.google.cloud.documentai.v1.DocumentProcessorServiceClient;
23+
import com.google.cloud.documentai.v1.ProcessRequest;
24+
import com.google.cloud.documentai.v1.ProcessResponse;
25+
import com.google.cloud.documentai.v1.RawDocument;
2526
import com.google.protobuf.ByteString;
2627
import java.io.IOException;
2728
import java.nio.file.Files;
@@ -30,7 +31,7 @@
3031
import java.util.concurrent.ExecutionException;
3132
import java.util.concurrent.TimeoutException;
3233

33-
public class ProcessDocumentBeta {
34+
public class ProcessDocument {
3435
public static void processDocument()
3536
throws IOException, InterruptedException, ExecutionException, TimeoutException {
3637
// TODO(developer): Replace these variables before running the sample.
@@ -60,12 +61,12 @@ public static void processDocument(
6061
// Convert the image data to a Buffer and base64 encode it.
6162
ByteString content = ByteString.copyFrom(imageFileData);
6263

63-
Document document =
64-
Document.newBuilder().setContent(content).setMimeType("application/pdf").build();
64+
RawDocument document =
65+
RawDocument.newBuilder().setContent(content).setMimeType("application/pdf").build();
6566

6667
// Configure the process request.
6768
ProcessRequest request =
68-
ProcessRequest.newBuilder().setName(name).setDocument(document).build();
69+
ProcessRequest.newBuilder().setName(name).setRawDocument(document).build();
6970

7071
// Recognizes text entities in the PDF document
7172
ProcessResponse result = client.processDocument(request);

‎document-ai/snippets/src/main/java/documentai/v1beta3/QuickStart.java renamed to ‎document-ai/snippets/src/main/java/documentai/v1/QuickStart.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package documentai.v1beta3;
17+
package documentai.v1;
1818

1919
// [START documentai_quickstart]
20-
21-
import com.google.cloud.documentai.v1beta3.Document;
22-
import com.google.cloud.documentai.v1beta3.DocumentProcessorServiceClient;
23-
import com.google.cloud.documentai.v1beta3.ProcessRequest;
24-
import com.google.cloud.documentai.v1beta3.ProcessResponse;
20+
import com.google.cloud.documentai.v1.Document;
21+
import com.google.cloud.documentai.v1.DocumentProcessorServiceClient;
22+
import com.google.cloud.documentai.v1.ProcessRequest;
23+
import com.google.cloud.documentai.v1.ProcessResponse;
24+
import com.google.cloud.documentai.v1.RawDocument;
2525
import com.google.protobuf.ByteString;
2626
import java.io.IOException;
2727
import java.nio.file.Files;
@@ -31,7 +31,7 @@
3131
import java.util.concurrent.TimeoutException;
3232

3333
public class QuickStart {
34-
public static void quickStart()
34+
public static void main(String[] args)
3535
throws IOException, InterruptedException, ExecutionException, TimeoutException {
3636
// TODO(developer): Replace these variables before running the sample.
3737
String projectId = "your-project-id";
@@ -60,12 +60,12 @@ public static void quickStart(
6060
// Convert the image data to a Buffer and base64 encode it.
6161
ByteString content = ByteString.copyFrom(imageFileData);
6262

63-
Document document =
64-
Document.newBuilder().setContent(content).setMimeType("application/pdf").build();
63+
RawDocument document =
64+
RawDocument.newBuilder().setContent(content).setMimeType("application/pdf").build();
6565

6666
// Configure the process request.
6767
ProcessRequest request =
68-
ProcessRequest.newBuilder().setName(name).setDocument(document).build();
68+
ProcessRequest.newBuilder().setName(name).setRawDocument(document).build();
6969

7070
// Recognizes text entities in the PDF document
7171
ProcessResponse result = client.processDocument(request);

‎document-ai/snippets/src/test/java/documentai/v1beta3/BatchProcessDocumentBetaTest.java renamed to ‎document-ai/snippets/src/test/java/documentai/v1/BatchProcessDocumentTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package documentai.v1beta3;
17+
package documentai.v1;
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static org.junit.Assert.assertNotNull;
@@ -34,7 +34,7 @@
3434
import org.junit.Before;
3535
import org.junit.Test;
3636

37-
public class BatchProcessDocumentBetaTest {
37+
public class BatchProcessDocumentTest {
3838
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
3939
private static final String PROCESSOR_ID = "88541adc6eeec481";
4040
private static final String BUCKET_NAME =
@@ -99,7 +99,7 @@ public void setUp() {
9999
public void testBatchProcessDocument()
100100
throws InterruptedException, ExecutionException, TimeoutException, IOException {
101101
// parse the GCS invoice as a form.
102-
BatchProcessDocumentBeta.batchProcessDocument(
102+
BatchProcessDocument.batchProcessDocument(
103103
PROJECT_ID, "us", PROCESSOR_ID, INPUT_URI, OUTPUT_BUCKET_NAME, OUTPUT_PREFIX);
104104
String got = bout.toString();
105105

‎document-ai/snippets/src/test/java/documentai/v1beta3/ProcessDocumentTest.java renamed to ‎document-ai/snippets/src/test/java/documentai/v1/ProcessDocumentTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package documentai.v1beta3;
17+
package documentai.v1;
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static org.junit.Assert.assertNotNull;
@@ -61,7 +61,7 @@ public void setUp() {
6161
public void testProcessDocument()
6262
throws InterruptedException, ExecutionException, IOException, TimeoutException {
6363
// parse the GCS invoice as a form.
64-
ProcessDocumentBeta.processDocument(PROJECT_ID, "us", PROCESSOR_ID, FILE_PATH);
64+
ProcessDocument.processDocument(PROJECT_ID, "us", PROCESSOR_ID, FILE_PATH);
6565
String got = bout.toString();
6666

6767
assertThat(got).contains("Paragraph text:");

‎document-ai/snippets/src/test/java/documentai/v1beta3/QuickStartTest.java renamed to ‎document-ai/snippets/src/test/java/documentai/v1/QuickStartTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package documentai.v1beta3;
17+
package documentai.v1;
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static org.junit.Assert.assertNotNull;

0 commit comments

Comments
 (0)