Skip to content

Commit f345548

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [storagetransfer] add default retry configuration (#8346)
- [ ] Regenerate this pull request now. feat: add DeleteTransferJob operation feat: add AWS S3 compatible data source PiperOrigin-RevId: 473348271 Source-Link: googleapis/googleapis@56f2049 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4f0ba4ff11c129006f76be68465f8e68a4a32814 Copy-Tag: eyJwIjoiamF2YS1zdG9yYWdlLXRyYW5zZmVyLy5Pd2xCb3QueWFtbCIsImgiOiI0ZjBiYTRmZjExYzEyOTAwNmY3NmJlNjg0NjVmOGU2OGE0YTMyODE0In0=
1 parent ade5230 commit f345548

17 files changed

Lines changed: 6253 additions & 491 deletions

File tree

‎java-storage-transfer/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>google-cloud-storage-transfer</artifactId>
22-
<version>1.2.1</version>
22+
<version>1.2.2</version>
2323
</dependency>
2424
```
2525

2626
If you are using Gradle without BOM, add this to your dependencies:
2727

2828
```Groovy
29-
implementation 'com.google.cloud:google-cloud-storage-transfer:1.2.1'
29+
implementation 'com.google.cloud:google-cloud-storage-transfer:1.2.2'
3030
```
3131

3232
If you are using SBT, add this to your dependencies:
3333

3434
```Scala
35-
libraryDependencies += "com.google.cloud" % "google-cloud-storage-transfer" % "1.2.1"
35+
libraryDependencies += "com.google.cloud" % "google-cloud-storage-transfer" % "1.2.2"
3636
```
3737

3838
## Authentication

‎java-storage-transfer/google-cloud-storage-transfer/src/main/java/com/google/storagetransfer/v1/proto/StorageTransferServiceClient.java‎

Lines changed: 253 additions & 76 deletions
Large diffs are not rendered by default.

‎java-storage-transfer/google-cloud-storage-transfer/src/main/java/com/google/storagetransfer/v1/proto/StorageTransferServiceSettings.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,11 @@
5858
* <p>For example, to set the total timeout of getGoogleServiceAccount to 30 seconds:
5959
*
6060
* <pre>{@code
61-
* // This snippet has been automatically generated for illustrative purposes only.
62-
* // It may require modifications to work in your environment.
61+
* // This snippet has been automatically generated and should be regarded as a code template only.
62+
* // It will require modifications to work:
63+
* // - It may require correct/in-range values for request initialization.
64+
* // - It may require specifying regional endpoints when creating the service client as shown in
65+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
6366
* StorageTransferServiceSettings.Builder storageTransferServiceSettingsBuilder =
6467
* StorageTransferServiceSettings.newBuilder();
6568
* storageTransferServiceSettingsBuilder
@@ -141,6 +144,12 @@ public class StorageTransferServiceSettings extends ClientSettings<StorageTransf
141144
.runTransferJobOperationSettings();
142145
}
143146

147+
/** Returns the object with the settings used for calls to deleteTransferJob. */
148+
public UnaryCallSettings<TransferProto.DeleteTransferJobRequest, Empty>
149+
deleteTransferJobSettings() {
150+
return ((StorageTransferServiceStubSettings) getStubSettings()).deleteTransferJobSettings();
151+
}
152+
144153
/** Returns the object with the settings used for calls to createAgentPool. */
145154
public UnaryCallSettings<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
146155
createAgentPoolSettings() {
@@ -350,6 +359,12 @@ public Builder applyToAllUnaryMethods(
350359
return getStubSettingsBuilder().runTransferJobOperationSettings();
351360
}
352361

362+
/** Returns the builder for the settings used for calls to deleteTransferJob. */
363+
public UnaryCallSettings.Builder<TransferProto.DeleteTransferJobRequest, Empty>
364+
deleteTransferJobSettings() {
365+
return getStubSettingsBuilder().deleteTransferJobSettings();
366+
}
367+
353368
/** Returns the builder for the settings used for calls to createAgentPool. */
354369
public UnaryCallSettings.Builder<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
355370
createAgentPoolSettings() {

‎java-storage-transfer/google-cloud-storage-transfer/src/main/java/com/google/storagetransfer/v1/proto/gapic_metadata.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"DeleteAgentPool": {
2020
"methods": ["deleteAgentPool", "deleteAgentPool", "deleteAgentPoolCallable"]
2121
},
22+
"DeleteTransferJob": {
23+
"methods": ["deleteTransferJob", "deleteTransferJobCallable"]
24+
},
2225
"GetAgentPool": {
2326
"methods": ["getAgentPool", "getAgentPool", "getAgentPoolCallable"]
2427
},

‎java-storage-transfer/google-cloud-storage-transfer/src/main/java/com/google/storagetransfer/v1/proto/package-info.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727
* <p>Sample for StorageTransferServiceClient:
2828
*
2929
* <pre>{@code
30-
* // This snippet has been automatically generated for illustrative purposes only.
31-
* // It may require modifications to work in your environment.
30+
* // This snippet has been automatically generated and should be regarded as a code template only.
31+
* // It will require modifications to work:
32+
* // - It may require correct/in-range values for request initialization.
33+
* // - It may require specifying regional endpoints when creating the service client as shown in
34+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
3235
* try (StorageTransferServiceClient storageTransferServiceClient =
3336
* StorageTransferServiceClient.create()) {
3437
* TransferProto.GetGoogleServiceAccountRequest request =

‎java-storage-transfer/google-cloud-storage-transfer/src/main/java/com/google/storagetransfer/v1/proto/stub/GrpcStorageTransferServiceStub.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,18 @@ public class GrpcStorageTransferServiceStub extends StorageTransferServiceStub {
155155
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
156156
.build();
157157

158+
private static final MethodDescriptor<TransferProto.DeleteTransferJobRequest, Empty>
159+
deleteTransferJobMethodDescriptor =
160+
MethodDescriptor.<TransferProto.DeleteTransferJobRequest, Empty>newBuilder()
161+
.setType(MethodDescriptor.MethodType.UNARY)
162+
.setFullMethodName(
163+
"google.storagetransfer.v1.StorageTransferService/DeleteTransferJob")
164+
.setRequestMarshaller(
165+
ProtoUtils.marshaller(
166+
TransferProto.DeleteTransferJobRequest.getDefaultInstance()))
167+
.setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
168+
.build();
169+
158170
private static final MethodDescriptor<
159171
TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
160172
createAgentPoolMethodDescriptor =
@@ -239,6 +251,8 @@ public class GrpcStorageTransferServiceStub extends StorageTransferServiceStub {
239251
private final OperationCallable<
240252
TransferProto.RunTransferJobRequest, Empty, TransferTypes.TransferOperation>
241253
runTransferJobOperationCallable;
254+
private final UnaryCallable<TransferProto.DeleteTransferJobRequest, Empty>
255+
deleteTransferJobCallable;
242256
private final UnaryCallable<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
243257
createAgentPoolCallable;
244258
private final UnaryCallable<TransferProto.UpdateAgentPoolRequest, TransferTypes.AgentPool>
@@ -380,6 +394,17 @@ protected GrpcStorageTransferServiceStub(
380394
return params.build();
381395
})
382396
.build();
397+
GrpcCallSettings<TransferProto.DeleteTransferJobRequest, Empty>
398+
deleteTransferJobTransportSettings =
399+
GrpcCallSettings.<TransferProto.DeleteTransferJobRequest, Empty>newBuilder()
400+
.setMethodDescriptor(deleteTransferJobMethodDescriptor)
401+
.setParamsExtractor(
402+
request -> {
403+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
404+
params.put("job_name", String.valueOf(request.getJobName()));
405+
return params.build();
406+
})
407+
.build();
383408
GrpcCallSettings<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
384409
createAgentPoolTransportSettings =
385410
GrpcCallSettings
@@ -484,6 +509,11 @@ protected GrpcStorageTransferServiceStub(
484509
settings.runTransferJobOperationSettings(),
485510
clientContext,
486511
operationsStub);
512+
this.deleteTransferJobCallable =
513+
callableFactory.createUnaryCallable(
514+
deleteTransferJobTransportSettings,
515+
settings.deleteTransferJobSettings(),
516+
clientContext);
487517
this.createAgentPoolCallable =
488518
callableFactory.createUnaryCallable(
489519
createAgentPoolTransportSettings, settings.createAgentPoolSettings(), clientContext);
@@ -573,6 +603,11 @@ public UnaryCallable<TransferProto.RunTransferJobRequest, Operation> runTransfer
573603
return runTransferJobOperationCallable;
574604
}
575605

606+
@Override
607+
public UnaryCallable<TransferProto.DeleteTransferJobRequest, Empty> deleteTransferJobCallable() {
608+
return deleteTransferJobCallable;
609+
}
610+
576611
@Override
577612
public UnaryCallable<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
578613
createAgentPoolCallable() {

‎java-storage-transfer/google-cloud-storage-transfer/src/main/java/com/google/storagetransfer/v1/proto/stub/HttpJsonStorageTransferServiceStub.java‎

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
129129
.setRequestBodyExtractor(
130130
request ->
131131
ProtoRestSerializer.create()
132-
.toBody("transferJob", request.getTransferJob()))
132+
.toBody("transferJob", request.getTransferJob(), false))
133133
.build())
134134
.setResponseParser(
135135
ProtoMessageResponseParser.<TransferTypes.TransferJob>newBuilder()
@@ -168,7 +168,7 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
168168
.setRequestBodyExtractor(
169169
request ->
170170
ProtoRestSerializer.create()
171-
.toBody("*", request.toBuilder().clearJobName().build()))
171+
.toBody("*", request.toBuilder().clearJobName().build(), false))
172172
.build())
173173
.setResponseParser(
174174
ProtoMessageResponseParser.<TransferTypes.TransferJob>newBuilder()
@@ -282,7 +282,7 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
282282
.setRequestBodyExtractor(
283283
request ->
284284
ProtoRestSerializer.create()
285-
.toBody("*", request.toBuilder().clearName().build()))
285+
.toBody("*", request.toBuilder().clearName().build(), false))
286286
.build())
287287
.setResponseParser(
288288
ProtoMessageResponseParser.<Empty>newBuilder()
@@ -320,7 +320,7 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
320320
.setRequestBodyExtractor(
321321
request ->
322322
ProtoRestSerializer.create()
323-
.toBody("*", request.toBuilder().clearName().build()))
323+
.toBody("*", request.toBuilder().clearName().build(), false))
324324
.build())
325325
.setResponseParser(
326326
ProtoMessageResponseParser.<Empty>newBuilder()
@@ -356,7 +356,7 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
356356
.setRequestBodyExtractor(
357357
request ->
358358
ProtoRestSerializer.create()
359-
.toBody("*", request.toBuilder().clearJobName().build()))
359+
.toBody("*", request.toBuilder().clearJobName().build(), false))
360360
.build())
361361
.setResponseParser(
362362
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -368,6 +368,41 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
368368
HttpJsonOperationSnapshot.create(response))
369369
.build();
370370

371+
private static final ApiMethodDescriptor<TransferProto.DeleteTransferJobRequest, Empty>
372+
deleteTransferJobMethodDescriptor =
373+
ApiMethodDescriptor.<TransferProto.DeleteTransferJobRequest, Empty>newBuilder()
374+
.setFullMethodName(
375+
"google.storagetransfer.v1.StorageTransferService/DeleteTransferJob")
376+
.setHttpMethod("DELETE")
377+
.setType(ApiMethodDescriptor.MethodType.UNARY)
378+
.setRequestFormatter(
379+
ProtoMessageRequestFormatter.<TransferProto.DeleteTransferJobRequest>newBuilder()
380+
.setPath(
381+
"/v1/{jobName=transferJobs/**}",
382+
request -> {
383+
Map<String, String> fields = new HashMap<>();
384+
ProtoRestSerializer<TransferProto.DeleteTransferJobRequest> serializer =
385+
ProtoRestSerializer.create();
386+
serializer.putPathParam(fields, "jobName", request.getJobName());
387+
return fields;
388+
})
389+
.setQueryParamsExtractor(
390+
request -> {
391+
Map<String, List<String>> fields = new HashMap<>();
392+
ProtoRestSerializer<TransferProto.DeleteTransferJobRequest> serializer =
393+
ProtoRestSerializer.create();
394+
serializer.putQueryParam(fields, "projectId", request.getProjectId());
395+
return fields;
396+
})
397+
.setRequestBodyExtractor(request -> null)
398+
.build())
399+
.setResponseParser(
400+
ProtoMessageResponseParser.<Empty>newBuilder()
401+
.setDefaultInstance(Empty.getDefaultInstance())
402+
.setDefaultTypeRegistry(typeRegistry)
403+
.build())
404+
.build();
405+
371406
private static final ApiMethodDescriptor<
372407
TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
373408
createAgentPoolMethodDescriptor =
@@ -399,7 +434,7 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
399434
.setRequestBodyExtractor(
400435
request ->
401436
ProtoRestSerializer.create()
402-
.toBody("agentPool", request.getAgentPool()))
437+
.toBody("agentPool", request.getAgentPool(), false))
403438
.build())
404439
.setResponseParser(
405440
ProtoMessageResponseParser.<TransferTypes.AgentPool>newBuilder()
@@ -439,7 +474,7 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
439474
.setRequestBodyExtractor(
440475
request ->
441476
ProtoRestSerializer.create()
442-
.toBody("agentPool", request.getAgentPool()))
477+
.toBody("agentPool", request.getAgentPool(), false))
443478
.build())
444479
.setResponseParser(
445480
ProtoMessageResponseParser.<TransferTypes.AgentPool>newBuilder()
@@ -578,6 +613,8 @@ public class HttpJsonStorageTransferServiceStub extends StorageTransferServiceSt
578613
private final OperationCallable<
579614
TransferProto.RunTransferJobRequest, Empty, TransferTypes.TransferOperation>
580615
runTransferJobOperationCallable;
616+
private final UnaryCallable<TransferProto.DeleteTransferJobRequest, Empty>
617+
deleteTransferJobCallable;
581618
private final UnaryCallable<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
582619
createAgentPoolCallable;
583620
private final UnaryCallable<TransferProto.UpdateAgentPoolRequest, TransferTypes.AgentPool>
@@ -695,6 +732,12 @@ protected HttpJsonStorageTransferServiceStub(
695732
.setMethodDescriptor(runTransferJobMethodDescriptor)
696733
.setTypeRegistry(typeRegistry)
697734
.build();
735+
HttpJsonCallSettings<TransferProto.DeleteTransferJobRequest, Empty>
736+
deleteTransferJobTransportSettings =
737+
HttpJsonCallSettings.<TransferProto.DeleteTransferJobRequest, Empty>newBuilder()
738+
.setMethodDescriptor(deleteTransferJobMethodDescriptor)
739+
.setTypeRegistry(typeRegistry)
740+
.build();
698741
HttpJsonCallSettings<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
699742
createAgentPoolTransportSettings =
700743
HttpJsonCallSettings
@@ -774,6 +817,11 @@ protected HttpJsonStorageTransferServiceStub(
774817
settings.runTransferJobOperationSettings(),
775818
clientContext,
776819
httpJsonOperationsStub);
820+
this.deleteTransferJobCallable =
821+
callableFactory.createUnaryCallable(
822+
deleteTransferJobTransportSettings,
823+
settings.deleteTransferJobSettings(),
824+
clientContext);
777825
this.createAgentPoolCallable =
778826
callableFactory.createUnaryCallable(
779827
createAgentPoolTransportSettings, settings.createAgentPoolSettings(), clientContext);
@@ -808,6 +856,7 @@ public static List<ApiMethodDescriptor> getMethodDescriptors() {
808856
methodDescriptors.add(pauseTransferOperationMethodDescriptor);
809857
methodDescriptors.add(resumeTransferOperationMethodDescriptor);
810858
methodDescriptors.add(runTransferJobMethodDescriptor);
859+
methodDescriptors.add(deleteTransferJobMethodDescriptor);
811860
methodDescriptors.add(createAgentPoolMethodDescriptor);
812861
methodDescriptors.add(updateAgentPoolMethodDescriptor);
813862
methodDescriptors.add(getAgentPoolMethodDescriptor);
@@ -882,6 +931,11 @@ public UnaryCallable<TransferProto.RunTransferJobRequest, Operation> runTransfer
882931
return runTransferJobOperationCallable;
883932
}
884933

934+
@Override
935+
public UnaryCallable<TransferProto.DeleteTransferJobRequest, Empty> deleteTransferJobCallable() {
936+
return deleteTransferJobCallable;
937+
}
938+
885939
@Override
886940
public UnaryCallable<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
887941
createAgentPoolCallable() {

‎java-storage-transfer/google-cloud-storage-transfer/src/main/java/com/google/storagetransfer/v1/proto/stub/StorageTransferServiceStub.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ public UnaryCallable<TransferProto.RunTransferJobRequest, Operation> runTransfer
9898
throw new UnsupportedOperationException("Not implemented: runTransferJobCallable()");
9999
}
100100

101+
public UnaryCallable<TransferProto.DeleteTransferJobRequest, Empty> deleteTransferJobCallable() {
102+
throw new UnsupportedOperationException("Not implemented: deleteTransferJobCallable()");
103+
}
104+
101105
public UnaryCallable<TransferProto.CreateAgentPoolRequest, TransferTypes.AgentPool>
102106
createAgentPoolCallable() {
103107
throw new UnsupportedOperationException("Not implemented: createAgentPoolCallable()");

0 commit comments

Comments
 (0)