**/ public static final class DocumentUnderstandingServiceBlockingStub - extends io.grpc.stub.AbstractStub* try (DocumentUnderstandingServiceClient documentUnderstandingServiceClient = DocumentUnderstandingServiceClient.create()) { - * ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder().build(); + * InputConfig inputConfig = InputConfig.newBuilder().build(); + * ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder() + * .setInputConfig(inputConfig) + * .build(); * Document response = documentUnderstandingServiceClient.processDocument(request); * } *@@ -280,7 +283,10 @@ public final OperationsClient getOperationsClient() { * *@@ -300,7 +306,10 @@ public final Document processDocument(ProcessDocumentRequest request) { * ** try (DocumentUnderstandingServiceClient documentUnderstandingServiceClient = DocumentUnderstandingServiceClient.create()) { - * ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder().build(); + * InputConfig inputConfig = InputConfig.newBuilder().build(); + * ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder() + * .setInputConfig(inputConfig) + * .build(); * Document response = documentUnderstandingServiceClient.processDocument(request); * } **/ public static final class DocumentUnderstandingServiceStub - extends io.grpc.stub.AbstractStub* try (DocumentUnderstandingServiceClient documentUnderstandingServiceClient = DocumentUnderstandingServiceClient.create()) { - * ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder().build(); + * InputConfig inputConfig = InputConfig.newBuilder().build(); + * ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder() + * .setInputConfig(inputConfig) + * .build(); * ApiFuture<Document> future = documentUnderstandingServiceClient.processDocumentCallable().futureCall(request); * // Do something * Document response = future.get(); diff --git a/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/DocumentUnderstandingServiceSettings.java b/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/DocumentUnderstandingServiceSettings.java index db7606aa..fe466b58 100644 --- a/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/DocumentUnderstandingServiceSettings.java +++ b/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/DocumentUnderstandingServiceSettings.java @@ -39,7 +39,7 @@ *The default instance has everything set to sensible defaults: * *
- *
diff --git a/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/package-info.java b/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/package-info.java index 62a42566..07963129 100644 --- a/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/package-info.java +++ b/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/package-info.java @@ -31,7 +31,10 @@ *- The default service address (documentai.googleapis.com) and default port (443) are used. + *
- The default service address (us-documentai.googleapis.com) and default port (443) are used. *
- Credentials are acquired automatically through Application Default Credentials. *
- Retries are configured for idempotent methods but not for non-idempotent methods. *
** try (DocumentUnderstandingServiceClient documentUnderstandingServiceClient = DocumentUnderstandingServiceClient.create()) { - * ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder().build(); + * InputConfig inputConfig = InputConfig.newBuilder().build(); + * ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder() + * .setInputConfig(inputConfig) + * .build(); * Document response = documentUnderstandingServiceClient.processDocument(request); * } *diff --git a/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/stub/DocumentUnderstandingServiceStubSettings.java b/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/stub/DocumentUnderstandingServiceStubSettings.java index d74b5e80..e92716f8 100644 --- a/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/stub/DocumentUnderstandingServiceStubSettings.java +++ b/google-cloud-document-ai/src/main/java/com/google/cloud/documentai/v1beta2/stub/DocumentUnderstandingServiceStubSettings.java @@ -56,7 +56,7 @@ *The default instance has everything set to sensible defaults: * *
- *
@@ -133,7 +133,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild /** Returns the default service endpoint. */ public static String getDefaultEndpoint() { - return "documentai.googleapis.com:443"; + return "us-documentai.googleapis.com:443"; } /** Returns the default service scopes. */ @@ -293,13 +293,13 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(500L)) .setRetryDelayMultiplier(1.5) - .setMaxRetryDelay(Duration.ofMillis(45000L)) + .setMaxRetryDelay(Duration.ofMillis(5000L)) .setInitialRpcTimeout(Duration.ZERO) // ignored .setRpcTimeoutMultiplier(1.0) // ignored .setMaxRpcTimeout(Duration.ZERO) // ignored - .setTotalTimeout(Duration.ofMillis(86400000L)) + .setTotalTimeout(Duration.ofMillis(300000L)) .build())); return builder; diff --git a/google-cloud-document-ai/src/test/java/com/google/cloud/documentai/v1beta2/DocumentUnderstandingServiceClientTest.java b/google-cloud-document-ai/src/test/java/com/google/cloud/documentai/v1beta2/DocumentUnderstandingServiceClientTest.java index 0f3f15f3..3b5b31c2 100644 --- a/google-cloud-document-ai/src/test/java/com/google/cloud/documentai/v1beta2/DocumentUnderstandingServiceClientTest.java +++ b/google-cloud-document-ai/src/test/java/com/google/cloud/documentai/v1beta2/DocumentUnderstandingServiceClientTest.java @@ -139,7 +139,9 @@ public void processDocumentTest() { Document.newBuilder().setUri(uri).setMimeType(mimeType).setText(text).build(); mockDocumentUnderstandingService.addResponse(expectedResponse); - ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder().build(); + InputConfig inputConfig = InputConfig.newBuilder().build(); + ProcessDocumentRequest request = + ProcessDocumentRequest.newBuilder().setInputConfig(inputConfig).build(); Document actualResponse = client.processDocument(request); Assert.assertEquals(expectedResponse, actualResponse); @@ -148,6 +150,7 @@ public void processDocumentTest() { Assert.assertEquals(1, actualRequests.size()); ProcessDocumentRequest actualRequest = (ProcessDocumentRequest) actualRequests.get(0); + Assert.assertEquals(inputConfig, actualRequest.getInputConfig()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -161,7 +164,9 @@ public void processDocumentExceptionTest() throws Exception { mockDocumentUnderstandingService.addException(exception); try { - ProcessDocumentRequest request = ProcessDocumentRequest.newBuilder().build(); + InputConfig inputConfig = InputConfig.newBuilder().build(); + ProcessDocumentRequest request = + ProcessDocumentRequest.newBuilder().setInputConfig(inputConfig).build(); client.processDocument(request); Assert.fail("No exception raised"); diff --git a/grpc-google-cloud-document-ai-v1beta1/pom.xml b/grpc-google-cloud-document-ai-v1beta1/pom.xml index de9c6349..19329c5e 100644 --- a/grpc-google-cloud-document-ai-v1beta1/pom.xml +++ b/grpc-google-cloud-document-ai-v1beta1/pom.xml @@ -3,13 +3,13 @@- The default service address (documentai.googleapis.com) and default port (443) are used. + *
- The default service address (us-documentai.googleapis.com) and default port (443) are used. *
- Credentials are acquired automatically through Application Default Credentials. *
- Retries are configured for idempotent methods but not for non-idempotent methods. *
4.0.0 com.google.api.grpc grpc-google-cloud-document-ai-v1beta1 -0.1.0 +0.1.1 grpc-google-cloud-document-ai-v1beta1 GRPC library for grpc-google-cloud-document-ai-v1beta1 com.google.cloud google-cloud-document-ai-parent -0.1.0 +0.1.1 diff --git a/grpc-google-cloud-document-ai-v1beta1/src/main/java/com/google/cloud/documentai/v1beta1/DocumentUnderstandingServiceGrpc.java b/grpc-google-cloud-document-ai-v1beta1/src/main/java/com/google/cloud/documentai/v1beta1/DocumentUnderstandingServiceGrpc.java index 4e2477f9..437a1671 100644 --- a/grpc-google-cloud-document-ai-v1beta1/src/main/java/com/google/cloud/documentai/v1beta1/DocumentUnderstandingServiceGrpc.java +++ b/grpc-google-cloud-document-ai-v1beta1/src/main/java/com/google/cloud/documentai/v1beta1/DocumentUnderstandingServiceGrpc.java @@ -96,19 +96,43 @@ private DocumentUnderstandingServiceGrpc() {} /** Creates a new async stub that supports all call types for the service */ public static DocumentUnderstandingServiceStub newStub(io.grpc.Channel channel) { - return new DocumentUnderstandingServiceStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory () { + @java.lang.Override + public DocumentUnderstandingServiceStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DocumentUnderstandingServiceStub(channel, callOptions); + } + }; + return DocumentUnderstandingServiceStub.newStub(factory, channel); } /** * Creates a new blocking-style stub that supports unary and streaming output calls on the service */ public static DocumentUnderstandingServiceBlockingStub newBlockingStub(io.grpc.Channel channel) { - return new DocumentUnderstandingServiceBlockingStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory () { + @java.lang.Override + public DocumentUnderstandingServiceBlockingStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DocumentUnderstandingServiceBlockingStub(channel, callOptions); + } + }; + return DocumentUnderstandingServiceBlockingStub.newStub(factory, channel); } /** Creates a new ListenableFuture-style stub that supports unary calls on the service */ public static DocumentUnderstandingServiceFutureStub newFutureStub(io.grpc.Channel channel) { - return new DocumentUnderstandingServiceFutureStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory () { + @java.lang.Override + public DocumentUnderstandingServiceFutureStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DocumentUnderstandingServiceFutureStub(channel, callOptions); + } + }; + return DocumentUnderstandingServiceFutureStub.newStub(factory, channel); } /** @@ -159,11 +183,7 @@ public final io.grpc.ServerServiceDefinition bindService() { * { - private DocumentUnderstandingServiceStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractAsyncStub { private DocumentUnderstandingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -202,11 +222,7 @@ public void batchProcessDocuments( *