Skip to content

Commit db3241b

Browse files
yoshi-automationsduskis
yoshi-automation
authored and
sduskis
committed
Regenerate dialogflow client (#5168)
1 parent d2b8075 commit db3241b

9 files changed

Lines changed: 287 additions & 12 deletions

File tree

‎google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsClient.java‎

Lines changed: 68 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -696,16 +696,76 @@ public final UnaryCallable<DeleteDocumentRequest, Operation> deleteDocumentCalla
696696
*
697697
* <pre><code>
698698
* try (DocumentsClient documentsClient = DocumentsClient.create()) {
699-
* UpdateDocumentRequest request = UpdateDocumentRequest.newBuilder().build();
700-
* Operation response = documentsClient.updateDocument(request);
699+
* Document document = Document.newBuilder().build();
700+
* Document response = documentsClient.updateDocumentAsync(document).get();
701+
* }
702+
* </code></pre>
703+
*
704+
* @param document Required. The document to update.
705+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
706+
*/
707+
@BetaApi(
708+
"The surface for long-running operations is not stable yet and may change in the future.")
709+
public final OperationFuture<Document, KnowledgeOperationMetadata> updateDocumentAsync(
710+
Document document) {
711+
712+
UpdateDocumentRequest request =
713+
UpdateDocumentRequest.newBuilder().setDocument(document).build();
714+
return updateDocumentAsync(request);
715+
}
716+
717+
// AUTO-GENERATED DOCUMENTATION AND METHOD
718+
/**
719+
* Updates the specified document. Operation &lt;response:
720+
* [Document][google.cloud.dialogflow.v2beta1.Document], metadata:
721+
* [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata]&gt;
722+
*
723+
* <p>Sample code:
724+
*
725+
* <pre><code>
726+
* try (DocumentsClient documentsClient = DocumentsClient.create()) {
727+
* Document document = Document.newBuilder().build();
728+
* UpdateDocumentRequest request = UpdateDocumentRequest.newBuilder()
729+
* .setDocument(document)
730+
* .build();
731+
* Document response = documentsClient.updateDocumentAsync(request).get();
701732
* }
702733
* </code></pre>
703734
*
704735
* @param request The request object containing all of the parameters for the API call.
705736
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
706737
*/
707-
public final Operation updateDocument(UpdateDocumentRequest request) {
708-
return updateDocumentCallable().call(request);
738+
@BetaApi(
739+
"The surface for long-running operations is not stable yet and may change in the future.")
740+
public final OperationFuture<Document, KnowledgeOperationMetadata> updateDocumentAsync(
741+
UpdateDocumentRequest request) {
742+
return updateDocumentOperationCallable().futureCall(request);
743+
}
744+
745+
// AUTO-GENERATED DOCUMENTATION AND METHOD
746+
/**
747+
* Updates the specified document. Operation &lt;response:
748+
* [Document][google.cloud.dialogflow.v2beta1.Document], metadata:
749+
* [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata]&gt;
750+
*
751+
* <p>Sample code:
752+
*
753+
* <pre><code>
754+
* try (DocumentsClient documentsClient = DocumentsClient.create()) {
755+
* Document document = Document.newBuilder().build();
756+
* UpdateDocumentRequest request = UpdateDocumentRequest.newBuilder()
757+
* .setDocument(document)
758+
* .build();
759+
* OperationFuture&lt;Document, KnowledgeOperationMetadata&gt; future = documentsClient.updateDocumentOperationCallable().futureCall(request);
760+
* // Do something
761+
* Document response = future.get();
762+
* }
763+
* </code></pre>
764+
*/
765+
@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
766+
public final OperationCallable<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
767+
updateDocumentOperationCallable() {
768+
return stub.updateDocumentOperationCallable();
709769
}
710770

711771
// AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -718,7 +778,10 @@ public final Operation updateDocument(UpdateDocumentRequest request) {
718778
*
719779
* <pre><code>
720780
* try (DocumentsClient documentsClient = DocumentsClient.create()) {
721-
* UpdateDocumentRequest request = UpdateDocumentRequest.newBuilder().build();
781+
* Document document = Document.newBuilder().build();
782+
* UpdateDocumentRequest request = UpdateDocumentRequest.newBuilder()
783+
* .setDocument(document)
784+
* .build();
722785
* ApiFuture&lt;Operation&gt; future = documentsClient.updateDocumentCallable().futureCall(request);
723786
* // Do something
724787
* Operation response = future.get();

‎google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsSettings.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@ public UnaryCallSettings<UpdateDocumentRequest, Operation> updateDocumentSetting
107107
return ((DocumentsStubSettings) getStubSettings()).updateDocumentSettings();
108108
}
109109

110+
/** Returns the object with the settings used for calls to updateDocument. */
111+
@BetaApi(
112+
"The surface for long-running operations is not stable yet and may change in the future.")
113+
public OperationCallSettings<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
114+
updateDocumentOperationSettings() {
115+
return ((DocumentsStubSettings) getStubSettings()).updateDocumentOperationSettings();
116+
}
117+
110118
/** Returns the object with the settings used for calls to reloadDocument. */
111119
public UnaryCallSettings<ReloadDocumentRequest, Operation> reloadDocumentSettings() {
112120
return ((DocumentsStubSettings) getStubSettings()).reloadDocumentSettings();
@@ -252,6 +260,15 @@ public UnaryCallSettings.Builder<UpdateDocumentRequest, Operation> updateDocumen
252260
return getStubSettingsBuilder().updateDocumentSettings();
253261
}
254262

263+
/** Returns the builder for the settings used for calls to updateDocument. */
264+
@BetaApi(
265+
"The surface for long-running operations is not stable yet and may change in the future.")
266+
public OperationCallSettings.Builder<
267+
UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
268+
updateDocumentOperationSettings() {
269+
return getStubSettingsBuilder().updateDocumentOperationSettings();
270+
}
271+
255272
/** Returns the builder for the settings used for calls to reloadDocument. */
256273
public UnaryCallSettings.Builder<ReloadDocumentRequest, Operation> reloadDocumentSettings() {
257274
return getStubSettingsBuilder().reloadDocumentSettings();

‎google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClient.java‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,33 @@ public final UnaryCallable<DeleteKnowledgeBaseRequest, Empty> deleteKnowledgeBas
594594
*
595595
* <pre><code>
596596
* try (KnowledgeBasesClient knowledgeBasesClient = KnowledgeBasesClient.create()) {
597-
* UpdateKnowledgeBaseRequest request = UpdateKnowledgeBaseRequest.newBuilder().build();
597+
* KnowledgeBase knowledgeBase = KnowledgeBase.newBuilder().build();
598+
* KnowledgeBase response = knowledgeBasesClient.updateKnowledgeBase(knowledgeBase);
599+
* }
600+
* </code></pre>
601+
*
602+
* @param knowledgeBase Required. The knowledge base to update.
603+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
604+
*/
605+
public final KnowledgeBase updateKnowledgeBase(KnowledgeBase knowledgeBase) {
606+
607+
UpdateKnowledgeBaseRequest request =
608+
UpdateKnowledgeBaseRequest.newBuilder().setKnowledgeBase(knowledgeBase).build();
609+
return updateKnowledgeBase(request);
610+
}
611+
612+
// AUTO-GENERATED DOCUMENTATION AND METHOD
613+
/**
614+
* Updates the specified knowledge base.
615+
*
616+
* <p>Sample code:
617+
*
618+
* <pre><code>
619+
* try (KnowledgeBasesClient knowledgeBasesClient = KnowledgeBasesClient.create()) {
620+
* KnowledgeBase knowledgeBase = KnowledgeBase.newBuilder().build();
621+
* UpdateKnowledgeBaseRequest request = UpdateKnowledgeBaseRequest.newBuilder()
622+
* .setKnowledgeBase(knowledgeBase)
623+
* .build();
598624
* KnowledgeBase response = knowledgeBasesClient.updateKnowledgeBase(request);
599625
* }
600626
* </code></pre>
@@ -614,7 +640,10 @@ public final KnowledgeBase updateKnowledgeBase(UpdateKnowledgeBaseRequest reques
614640
*
615641
* <pre><code>
616642
* try (KnowledgeBasesClient knowledgeBasesClient = KnowledgeBasesClient.create()) {
617-
* UpdateKnowledgeBaseRequest request = UpdateKnowledgeBaseRequest.newBuilder().build();
643+
* KnowledgeBase knowledgeBase = KnowledgeBase.newBuilder().build();
644+
* UpdateKnowledgeBaseRequest request = UpdateKnowledgeBaseRequest.newBuilder()
645+
* .setKnowledgeBase(knowledgeBase)
646+
* .build();
618647
* ApiFuture&lt;KnowledgeBase&gt; future = knowledgeBasesClient.updateKnowledgeBaseCallable().futureCall(request);
619648
* // Do something
620649
* KnowledgeBase response = future.get();

‎google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStub.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ public UnaryCallable<DeleteDocumentRequest, Operation> deleteDocumentCallable()
8383
throw new UnsupportedOperationException("Not implemented: deleteDocumentCallable()");
8484
}
8585

86+
@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
87+
public OperationCallable<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
88+
updateDocumentOperationCallable() {
89+
throw new UnsupportedOperationException("Not implemented: updateDocumentOperationCallable()");
90+
}
91+
8692
public UnaryCallable<UpdateDocumentRequest, Operation> updateDocumentCallable() {
8793
throw new UnsupportedOperationException("Not implemented: updateDocumentCallable()");
8894
}

‎google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ public class DocumentsStubSettings extends StubSettings<DocumentsStubSettings> {
110110
private final OperationCallSettings<DeleteDocumentRequest, Empty, KnowledgeOperationMetadata>
111111
deleteDocumentOperationSettings;
112112
private final UnaryCallSettings<UpdateDocumentRequest, Operation> updateDocumentSettings;
113+
private final OperationCallSettings<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
114+
updateDocumentOperationSettings;
113115
private final UnaryCallSettings<ReloadDocumentRequest, Operation> reloadDocumentSettings;
114116

115117
/** Returns the object with the settings used for calls to listDocuments. */
@@ -152,6 +154,13 @@ public UnaryCallSettings<UpdateDocumentRequest, Operation> updateDocumentSetting
152154
return updateDocumentSettings;
153155
}
154156

157+
/** Returns the object with the settings used for calls to updateDocument. */
158+
@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
159+
public OperationCallSettings<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
160+
updateDocumentOperationSettings() {
161+
return updateDocumentOperationSettings;
162+
}
163+
155164
/** Returns the object with the settings used for calls to reloadDocument. */
156165
public UnaryCallSettings<ReloadDocumentRequest, Operation> reloadDocumentSettings() {
157166
return reloadDocumentSettings;
@@ -231,6 +240,7 @@ protected DocumentsStubSettings(Builder settingsBuilder) throws IOException {
231240
deleteDocumentSettings = settingsBuilder.deleteDocumentSettings().build();
232241
deleteDocumentOperationSettings = settingsBuilder.deleteDocumentOperationSettings().build();
233242
updateDocumentSettings = settingsBuilder.updateDocumentSettings().build();
243+
updateDocumentOperationSettings = settingsBuilder.updateDocumentOperationSettings().build();
234244
reloadDocumentSettings = settingsBuilder.reloadDocumentSettings().build();
235245
}
236246

@@ -307,6 +317,9 @@ public static class Builder extends StubSettings.Builder<DocumentsStubSettings,
307317
deleteDocumentOperationSettings;
308318
private final UnaryCallSettings.Builder<UpdateDocumentRequest, Operation>
309319
updateDocumentSettings;
320+
private final OperationCallSettings.Builder<
321+
UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
322+
updateDocumentOperationSettings;
310323
private final UnaryCallSettings.Builder<ReloadDocumentRequest, Operation>
311324
reloadDocumentSettings;
312325

@@ -365,6 +378,8 @@ protected Builder(ClientContext clientContext) {
365378

366379
updateDocumentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
367380

381+
updateDocumentOperationSettings = OperationCallSettings.newBuilder();
382+
368383
reloadDocumentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
369384

370385
unaryMethodSettingsBuilders =
@@ -467,6 +482,30 @@ private static Builder initDefaults(Builder builder) {
467482
.setMaxRpcTimeout(Duration.ZERO) // ignored
468483
.setTotalTimeout(Duration.ofMillis(300000L))
469484
.build()));
485+
builder
486+
.updateDocumentOperationSettings()
487+
.setInitialCallSettings(
488+
UnaryCallSettings
489+
.<UpdateDocumentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
490+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
491+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
492+
.build())
493+
.setResponseTransformer(
494+
ProtoOperationTransformers.ResponseTransformer.create(Document.class))
495+
.setMetadataTransformer(
496+
ProtoOperationTransformers.MetadataTransformer.create(
497+
KnowledgeOperationMetadata.class))
498+
.setPollingAlgorithm(
499+
OperationTimedPollAlgorithm.create(
500+
RetrySettings.newBuilder()
501+
.setInitialRetryDelay(Duration.ofMillis(500L))
502+
.setRetryDelayMultiplier(1.5)
503+
.setMaxRetryDelay(Duration.ofMillis(5000L))
504+
.setInitialRpcTimeout(Duration.ZERO) // ignored
505+
.setRpcTimeoutMultiplier(1.0) // ignored
506+
.setMaxRpcTimeout(Duration.ZERO) // ignored
507+
.setTotalTimeout(Duration.ofMillis(300000L))
508+
.build()));
470509

471510
return builder;
472511
}
@@ -481,6 +520,7 @@ protected Builder(DocumentsStubSettings settings) {
481520
deleteDocumentSettings = settings.deleteDocumentSettings.toBuilder();
482521
deleteDocumentOperationSettings = settings.deleteDocumentOperationSettings.toBuilder();
483522
updateDocumentSettings = settings.updateDocumentSettings.toBuilder();
523+
updateDocumentOperationSettings = settings.updateDocumentOperationSettings.toBuilder();
484524
reloadDocumentSettings = settings.reloadDocumentSettings.toBuilder();
485525

486526
unaryMethodSettingsBuilders =
@@ -553,6 +593,15 @@ public UnaryCallSettings.Builder<UpdateDocumentRequest, Operation> updateDocumen
553593
return updateDocumentSettings;
554594
}
555595

596+
/** Returns the builder for the settings used for calls to updateDocument. */
597+
@BetaApi(
598+
"The surface for use by generated code is not stable yet and may change in the future.")
599+
public OperationCallSettings.Builder<
600+
UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
601+
updateDocumentOperationSettings() {
602+
return updateDocumentOperationSettings;
603+
}
604+
556605
/** Returns the builder for the settings used for calls to reloadDocument. */
557606
public UnaryCallSettings.Builder<ReloadDocumentRequest, Operation> reloadDocumentSettings() {
558607
return reloadDocumentSettings;

‎google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcDocumentsStub.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ public class GrpcDocumentsStub extends DocumentsStub {
124124
private final OperationCallable<DeleteDocumentRequest, Empty, KnowledgeOperationMetadata>
125125
deleteDocumentOperationCallable;
126126
private final UnaryCallable<UpdateDocumentRequest, Operation> updateDocumentCallable;
127+
private final OperationCallable<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
128+
updateDocumentOperationCallable;
127129
private final UnaryCallable<ReloadDocumentRequest, Operation> reloadDocumentCallable;
128130

129131
private final GrpcStubCallableFactory callableFactory;
@@ -274,6 +276,12 @@ public Map<String, String> extract(ReloadDocumentRequest request) {
274276
this.updateDocumentCallable =
275277
callableFactory.createUnaryCallable(
276278
updateDocumentTransportSettings, settings.updateDocumentSettings(), clientContext);
279+
this.updateDocumentOperationCallable =
280+
callableFactory.createOperationCallable(
281+
updateDocumentTransportSettings,
282+
settings.updateDocumentOperationSettings(),
283+
clientContext,
284+
this.operationsStub);
277285
this.reloadDocumentCallable =
278286
callableFactory.createUnaryCallable(
279287
reloadDocumentTransportSettings, settings.reloadDocumentSettings(), clientContext);
@@ -319,6 +327,12 @@ public UnaryCallable<DeleteDocumentRequest, Operation> deleteDocumentCallable()
319327
return deleteDocumentCallable;
320328
}
321329

330+
@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
331+
public OperationCallable<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
332+
updateDocumentOperationCallable() {
333+
return updateDocumentOperationCallable;
334+
}
335+
322336
public UnaryCallable<UpdateDocumentRequest, Operation> updateDocumentCallable() {
323337
return updateDocumentCallable;
324338
}

‎google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,60 @@ public void deleteDocumentExceptionTest() throws Exception {
304304
Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
305305
}
306306
}
307+
308+
@Test
309+
@SuppressWarnings("all")
310+
public void updateDocumentTest() throws Exception {
311+
DocumentName name = DocumentName.of("[PROJECT]", "[KNOWLEDGE_BASE]", "[DOCUMENT]");
312+
String displayName = "displayName1615086568";
313+
String mimeType = "mimeType-196041627";
314+
String contentUri = "contentUri-388807514";
315+
Document expectedResponse =
316+
Document.newBuilder()
317+
.setName(name.toString())
318+
.setDisplayName(displayName)
319+
.setMimeType(mimeType)
320+
.setContentUri(contentUri)
321+
.build();
322+
Operation resultOperation =
323+
Operation.newBuilder()
324+
.setName("updateDocumentTest")
325+
.setDone(true)
326+
.setResponse(Any.pack(expectedResponse))
327+
.build();
328+
mockDocuments.addResponse(resultOperation);
329+
330+
Document document = Document.newBuilder().build();
331+
332+
Document actualResponse = client.updateDocumentAsync(document).get();
333+
Assert.assertEquals(expectedResponse, actualResponse);
334+
335+
List<AbstractMessage> actualRequests = mockDocuments.getRequests();
336+
Assert.assertEquals(1, actualRequests.size());
337+
UpdateDocumentRequest actualRequest = (UpdateDocumentRequest) actualRequests.get(0);
338+
339+
Assert.assertEquals(document, actualRequest.getDocument());
340+
Assert.assertTrue(
341+
channelProvider.isHeaderSent(
342+
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
343+
GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
344+
}
345+
346+
@Test
347+
@SuppressWarnings("all")
348+
public void updateDocumentExceptionTest() throws Exception {
349+
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
350+
mockDocuments.addException(exception);
351+
352+
try {
353+
Document document = Document.newBuilder().build();
354+
355+
client.updateDocumentAsync(document).get();
356+
Assert.fail("No exception raised");
357+
} catch (ExecutionException e) {
358+
Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
359+
InvalidArgumentException apiException = (InvalidArgumentException) e.getCause();
360+
Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
361+
}
362+
}
307363
}

0 commit comments

Comments
 (0)