Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 50f0ad0

Browse files
yoshi-automationyoshi-automation
authored
fix: fix LRO annotations for method DiagnoseCluster. (#250)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/fa501585-95fa-4c4d-9062-c23b3406d7ec/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 321255718 Source-Link: googleapis/googleapis@0e7900e
1 parent b2cb7c6 commit 50f0ad0

File tree

9 files changed

+51
-40
lines changed

9 files changed

+51
-40
lines changed

‎google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ public final UnaryCallable<DeleteClusterRequest, Operation> deleteClusterCallabl
607607
* String projectId = "";
608608
* String region = "";
609609
* String clusterName = "";
610-
* clusterControllerClient.diagnoseClusterAsync(projectId, region, clusterName).get();
610+
* DiagnoseClusterResults response = clusterControllerClient.diagnoseClusterAsync(projectId, region, clusterName).get();
611611
* }
612612
* </code></pre>
613613
*
@@ -619,8 +619,8 @@ public final UnaryCallable<DeleteClusterRequest, Operation> deleteClusterCallabl
619619
*/
620620
@BetaApi(
621621
"The surface for long-running operations is not stable yet and may change in the future.")
622-
public final OperationFuture<Empty, DiagnoseClusterResults> diagnoseClusterAsync(
623-
String projectId, String region, String clusterName) {
622+
public final OperationFuture<DiagnoseClusterResults, ClusterOperationMetadata>
623+
diagnoseClusterAsync(String projectId, String region, String clusterName) {
624624
DiagnoseClusterRequest request =
625625
DiagnoseClusterRequest.newBuilder()
626626
.setProjectId(projectId)
@@ -651,7 +651,7 @@ public final OperationFuture<Empty, DiagnoseClusterResults> diagnoseClusterAsync
651651
* .setRegion(region)
652652
* .setClusterName(clusterName)
653653
* .build();
654-
* clusterControllerClient.diagnoseClusterAsync(request).get();
654+
* DiagnoseClusterResults response = clusterControllerClient.diagnoseClusterAsync(request).get();
655655
* }
656656
* </code></pre>
657657
*
@@ -660,8 +660,8 @@ public final OperationFuture<Empty, DiagnoseClusterResults> diagnoseClusterAsync
660660
*/
661661
@BetaApi(
662662
"The surface for long-running operations is not stable yet and may change in the future.")
663-
public final OperationFuture<Empty, DiagnoseClusterResults> diagnoseClusterAsync(
664-
DiagnoseClusterRequest request) {
663+
public final OperationFuture<DiagnoseClusterResults, ClusterOperationMetadata>
664+
diagnoseClusterAsync(DiagnoseClusterRequest request) {
665665
return diagnoseClusterOperationCallable().futureCall(request);
666666
}
667667

@@ -686,14 +686,15 @@ public final OperationFuture<Empty, DiagnoseClusterResults> diagnoseClusterAsync
686686
* .setRegion(region)
687687
* .setClusterName(clusterName)
688688
* .build();
689-
* OperationFuture&lt;Empty, DiagnoseClusterResults&gt; future = clusterControllerClient.diagnoseClusterOperationCallable().futureCall(request);
689+
* OperationFuture&lt;DiagnoseClusterResults, ClusterOperationMetadata&gt; future = clusterControllerClient.diagnoseClusterOperationCallable().futureCall(request);
690690
* // Do something
691-
* future.get();
691+
* DiagnoseClusterResults response = future.get();
692692
* }
693693
* </code></pre>
694694
*/
695695
@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
696-
public final OperationCallable<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
696+
public final OperationCallable<
697+
DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
697698
diagnoseClusterOperationCallable() {
698699
return stub.diagnoseClusterOperationCallable();
699700
}
@@ -721,7 +722,7 @@ public final OperationFuture<Empty, DiagnoseClusterResults> diagnoseClusterAsync
721722
* .build();
722723
* ApiFuture&lt;Operation&gt; future = clusterControllerClient.diagnoseClusterCallable().futureCall(request);
723724
* // Do something
724-
* future.get();
725+
* Operation response = future.get();
725726
* }
726727
* </code></pre>
727728
*/

‎google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public UnaryCallSettings<DiagnoseClusterRequest, Operation> diagnoseClusterSetti
117117
/** Returns the object with the settings used for calls to diagnoseCluster. */
118118
@BetaApi(
119119
"The surface for long-running operations is not stable yet and may change in the future.")
120-
public OperationCallSettings<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
120+
public OperationCallSettings<
121+
DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
121122
diagnoseClusterOperationSettings() {
122123
return ((ClusterControllerStubSettings) getStubSettings()).diagnoseClusterOperationSettings();
123124
}
@@ -277,7 +278,8 @@ public UnaryCallSettings.Builder<DiagnoseClusterRequest, Operation> diagnoseClus
277278
/** Returns the builder for the settings used for calls to diagnoseCluster. */
278279
@BetaApi(
279280
"The surface for long-running operations is not stable yet and may change in the future.")
280-
public OperationCallSettings.Builder<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
281+
public OperationCallSettings.Builder<
282+
DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
281283
diagnoseClusterOperationSettings() {
282284
return getStubSettingsBuilder().diagnoseClusterOperationSettings();
283285
}

‎google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public UnaryCallable<DeleteClusterRequest, Operation> deleteClusterCallable() {
8282
}
8383

8484
@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
85-
public OperationCallable<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
85+
public OperationCallable<DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
8686
diagnoseClusterOperationCallable() {
8787
throw new UnsupportedOperationException("Not implemented: diagnoseClusterOperationCallable()");
8888
}

‎google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ public class ClusterControllerStubSettings extends StubSettings<ClusterControlle
112112
private final OperationCallSettings<DeleteClusterRequest, Empty, ClusterOperationMetadata>
113113
deleteClusterOperationSettings;
114114
private final UnaryCallSettings<DiagnoseClusterRequest, Operation> diagnoseClusterSettings;
115-
private final OperationCallSettings<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
115+
private final OperationCallSettings<
116+
DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
116117
diagnoseClusterOperationSettings;
117118
private final UnaryCallSettings<GetClusterRequest, Cluster> getClusterSettings;
118119
private final PagedCallSettings<
@@ -162,7 +163,8 @@ public UnaryCallSettings<DiagnoseClusterRequest, Operation> diagnoseClusterSetti
162163

163164
/** Returns the object with the settings used for calls to diagnoseCluster. */
164165
@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
165-
public OperationCallSettings<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
166+
public OperationCallSettings<
167+
DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
166168
diagnoseClusterOperationSettings() {
167169
return diagnoseClusterOperationSettings;
168170
}
@@ -331,7 +333,7 @@ public static class Builder extends StubSettings.Builder<ClusterControllerStubSe
331333
private final UnaryCallSettings.Builder<DiagnoseClusterRequest, Operation>
332334
diagnoseClusterSettings;
333335
private final OperationCallSettings.Builder<
334-
DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
336+
DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
335337
diagnoseClusterOperationSettings;
336338
private final UnaryCallSettings.Builder<GetClusterRequest, Cluster> getClusterSettings;
337339
private final PagedCallSettings.Builder<
@@ -547,9 +549,9 @@ private static Builder initDefaults(Builder builder) {
547549
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"))
548550
.build())
549551
.setResponseTransformer(
550-
ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
552+
ProtoOperationTransformers.ResponseTransformer.create(DiagnoseClusterResults.class))
551553
.setMetadataTransformer(
552-
ProtoOperationTransformers.MetadataTransformer.create(DiagnoseClusterResults.class))
554+
ProtoOperationTransformers.MetadataTransformer.create(ClusterOperationMetadata.class))
553555
.setPollingAlgorithm(
554556
OperationTimedPollAlgorithm.create(
555557
RetrySettings.newBuilder()
@@ -652,7 +654,8 @@ public UnaryCallSettings.Builder<DiagnoseClusterRequest, Operation> diagnoseClus
652654
/** Returns the builder for the settings used for calls to diagnoseCluster. */
653655
@BetaApi(
654656
"The surface for use by generated code is not stable yet and may change in the future.")
655-
public OperationCallSettings.Builder<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
657+
public OperationCallSettings.Builder<
658+
DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
656659
diagnoseClusterOperationSettings() {
657660
return diagnoseClusterOperationSettings;
658661
}

‎google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ public class GrpcClusterControllerStub extends ClusterControllerStub {
120120
private final OperationCallable<DeleteClusterRequest, Empty, ClusterOperationMetadata>
121121
deleteClusterOperationCallable;
122122
private final UnaryCallable<DiagnoseClusterRequest, Operation> diagnoseClusterCallable;
123-
private final OperationCallable<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
123+
private final OperationCallable<
124+
DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
124125
diagnoseClusterOperationCallable;
125126
private final UnaryCallable<GetClusterRequest, Cluster> getClusterCallable;
126127
private final UnaryCallable<ListClustersRequest, ListClustersResponse> listClustersCallable;
@@ -279,7 +280,7 @@ public UnaryCallable<DeleteClusterRequest, Operation> deleteClusterCallable() {
279280
}
280281

281282
@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
282-
public OperationCallable<DiagnoseClusterRequest, Empty, DiagnoseClusterResults>
283+
public OperationCallable<DiagnoseClusterRequest, DiagnoseClusterResults, ClusterOperationMetadata>
283284
diagnoseClusterOperationCallable() {
284285
return diagnoseClusterOperationCallable;
285286
}

‎google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,9 @@ public void deleteClusterExceptionTest() throws Exception {
276276
@Test
277277
@SuppressWarnings("all")
278278
public void diagnoseClusterTest() throws Exception {
279-
Empty expectedResponse = Empty.newBuilder().build();
279+
String outputUri = "outputUri-1273518802";
280+
DiagnoseClusterResults expectedResponse =
281+
DiagnoseClusterResults.newBuilder().setOutputUri(outputUri).build();
280282
Operation resultOperation =
281283
Operation.newBuilder()
282284
.setName("diagnoseClusterTest")
@@ -289,7 +291,8 @@ public void diagnoseClusterTest() throws Exception {
289291
String region = "region-934795532";
290292
String clusterName = "clusterName-1018081872";
291293

292-
Empty actualResponse = client.diagnoseClusterAsync(projectId, region, clusterName).get();
294+
DiagnoseClusterResults actualResponse =
295+
client.diagnoseClusterAsync(projectId, region, clusterName).get();
293296
Assert.assertEquals(expectedResponse, actualResponse);
294297

295298
List<AbstractMessage> actualRequests = mockClusterController.getRequests();

‎proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
308308
+ "TypeB\003\340A\001\022\020\n\003key\030\002 \001(\tB\003\340A\001\022\023\n\006values\030\003 "
309309
+ "\003(\tB\003\340A\001\"_\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022"
310310
+ "\n\016NO_RESERVATION\020\001\022\023\n\017ANY_RESERVATION\020\002\022"
311-
+ "\030\n\024SPECIFIC_RESERVATION\020\0032\343\014\n\021ClusterCon"
311+
+ "\030\n\024SPECIFIC_RESERVATION\020\0032\377\014\n\021ClusterCon"
312312
+ "troller\022\200\002\n\rCreateCluster\022..google.cloud"
313313
+ ".dataproc.v1.CreateClusterRequest\032\035.goog"
314314
+ "le.longrunning.Operation\"\237\001\202\323\344\223\002>\"3/v1/p"
@@ -340,19 +340,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
340340
+ "google.cloud.dataproc.v1.ListClustersRes"
341341
+ "ponse\"j\202\323\344\223\0025\0223/v1/projects/{project_id}"
342342
+ "/regions/{region}/clusters\332A\021project_id,"
343-
+ "region\332A\030project_id,region,filter\022\216\002\n\017Di"
343+
+ "region\332A\030project_id,region,filter\022\252\002\n\017Di"
344344
+ "agnoseCluster\0220.google.cloud.dataproc.v1"
345345
+ ".DiagnoseClusterRequest\032\035.google.longrun"
346-
+ "ning.Operation\"\251\001\202\323\344\223\002P\"K/v1/projects/{p"
346+
+ "ning.Operation\"\305\001\202\323\344\223\002P\"K/v1/projects/{p"
347347
+ "roject_id}/regions/{region}/clusters/{cl"
348348
+ "uster_name}:diagnose:\001*\332A\036project_id,reg"
349-
+ "ion,cluster_name\312A/\n\025google.protobuf.Emp"
350-
+ "ty\022\026DiagnoseClusterResults\032K\312A\027dataproc."
351-
+ "googleapis.com\322A.https://www.googleapis."
352-
+ "com/auth/cloud-platformBq\n\034com.google.cl"
353-
+ "oud.dataproc.v1B\rClustersProtoP\001Z@google"
354-
+ ".golang.org/genproto/googleapis/cloud/da"
355-
+ "taproc/v1;dataprocb\006proto3"
349+
+ "ion,cluster_name\312AK\n\026DiagnoseClusterResu"
350+
+ "lts\0221google.cloud.dataproc.v1.ClusterOpe"
351+
+ "rationMetadata\032K\312A\027dataproc.googleapis.c"
352+
+ "om\322A.https://www.googleapis.com/auth/clo"
353+
+ "ud-platformBq\n\034com.google.cloud.dataproc"
354+
+ ".v1B\rClustersProtoP\001[email protected]/"
355+
+ "genproto/googleapis/cloud/dataproc/v1;da"
356+
+ "taprocb\006proto3"
356357
};
357358
descriptor =
358359
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

‎proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/clusters.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ service ClusterController {
111111
};
112112
option (google.api.method_signature) = "project_id,region,cluster_name";
113113
option (google.longrunning.operation_info) = {
114-
response_type: "google.protobuf.Empty"
115-
metadata_type: "DiagnoseClusterResults"
114+
response_type: "DiagnoseClusterResults"
115+
metadata_type: "google.cloud.dataproc.v1.ClusterOperationMetadata"
116116
};
117117
}
118118
}

‎synth.metadata

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-dataproc.git",
7-
"sha": "f246195ad7aa0fd04694256f885c09b22c10289b"
7+
"sha": "bef1b0d43ffa90cf27303a87ce8e020083512841"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "googleapis",
1313
"remote": "https://github.com/googleapis/googleapis.git",
14-
"sha": "ec05fa81a492c84fbe5b85341738ced42604ce68",
15-
"internalRef": "320442976"
14+
"sha": "0e7900e3950d32ccafae22a2ccb85fa61ffe08f9",
15+
"internalRef": "321255718"
1616
}
1717
},
1818
{
1919
"git": {
2020
"name": "googleapis",
2121
"remote": "https://github.com/googleapis/googleapis.git",
22-
"sha": "ec05fa81a492c84fbe5b85341738ced42604ce68",
23-
"internalRef": "320442976"
22+
"sha": "0e7900e3950d32ccafae22a2ccb85fa61ffe08f9",
23+
"internalRef": "321255718"
2424
}
2525
},
2626
{

0 commit comments

Comments
 (0)