Skip to content

Commit 8efd0a5

Browse files
feat: implement deleteSourceObjects for compose operation
- Added deleteSourceObjects to Storage.ComposeRequest and Builder. - Updated StorageImpl, GrpcStorageImpl, and HttpStorageRpc to support the flag. - Added unit tests in StorageImplMockitoTest. - Added integration test in ITObjectTest. - Addressed PR feedback by directly setting the field in transport implementations. Co-authored-by: nidhiii-27 <224584462+nidhiii-27@users.noreply.github.com>
1 parent 4f0bd03 commit 8efd0a5

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -645,9 +645,7 @@ public Blob compose(ComposeRequest composeRequest) {
645645
.forEach(builder::addSourceObjects);
646646
final Object target = codecs.blobInfo().encode(composeRequest.getTarget());
647647
builder.setDestination(target);
648-
if (composeRequest.isDeleteSourceObjects()) {
649-
builder.setDeleteSourceObjects(true);
650-
}
648+
builder.setDeleteSourceObjects(composeRequest.isDeleteSourceObjects());
651649
ComposeObjectRequest req = opts.composeObjectsRequest().apply(builder).build();
652650
GrpcCallContext merge = Utils.merge(grpcCallContext, Retrying.newCallContext());
653651
return retrier.run(

java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -817,9 +817,7 @@ public StorageObject compose(
817817
sourceObjects.add(sourceObject);
818818
}
819819
request.setSourceObjects(sourceObjects);
820-
if (Option.DELETE_SOURCE_OBJECTS.getBoolean(targetOptions) != null) {
821-
request.setDeleteSourceObjects(Option.DELETE_SOURCE_OBJECTS.getBoolean(targetOptions));
822-
}
820+
request.setDeleteSourceObjects(Option.DELETE_SOURCE_OBJECTS.getBoolean(targetOptions));
823821
Span span = startSpan(HttpStorageRpcSpans.SPAN_NAME_COMPOSE);
824822
Scope scope = tracer.withSpan(span);
825823
try {

0 commit comments

Comments
 (0)