FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: ensure object generation is sent for Storage#update(BlobInfo) using HTTP Transport by BenWhitehead · Pull Request #3006 · googleapis/java-storage · GitHub

/ java-storage Public

fix: ensure object generation is sent for Storage#update(BlobInfo) using HTTP Transport #3006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenWhitehead merged 1 commit into from
Mar 21, 2025
Conversation 0 Commits 1 Checks 0 Files changed
Merged

fix: ensure object generation is sent for Storage#update(BlobInfo) using HTTP Transport #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .java  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
      • StorageImpl.java
      • ITObjectTest.java
6 changes: 5 additions & 1 deletion google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,11 @@ public Blob update(BlobInfo blobInfo, BlobTargetOption... options) {
} else {
StorageObject tmp = codecs.blobInfo().encode(updated);
StorageObject pb = new StorageObject();
Stream.concat(modifiedFields.stream(), BlobField.REQUIRED_FIELDS.stream())
Stream.of(
modifiedFields.stream(),
BlobField.REQUIRED_FIELDS.stream(),
Stream.of(BlobField.GENERATION))
.flatMap(s -> s) // .flatten()
.map(
f -> {
if (f instanceof NestedNamedField) {
Expand Down
25 changes: 25 additions & 0 deletions google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITObjectTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import javax.crypto.spec.SecretKeySpec;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand Down Expand Up @@ -1582,4 +1583,28 @@ public void testUpdateBlob_noModification() {
Blob gen2 = storage.update(gen1);
assertThat(gen2).isEqualTo(gen1);
}

@Test
public void blob_update() throws Exception {
ImmutableMap<@NonNull String, @NonNull String> meta1 = ImmutableMap.of("k1", "v1");
ImmutableMap<@NonNull String, @NonNull String> meta2 = ImmutableMap.of("k1", "v2");
ImmutableMap<@NonNull String, @NonNull String> meta3 = ImmutableMap.of("k1", "v1", "k2", "n1");

String randomObjectName = generator.randomObjectName();
BlobInfo info1 =
BlobInfo.newBuilder(versionedBucket, randomObjectName).setMetadata(meta1).build();
BlobInfo info2 =
BlobInfo.newBuilder(versionedBucket, randomObjectName).setMetadata(meta2).build();

BlobInfo gen1 = storage.create(info1);
BlobInfo gen2 = storage.create(info2);

BlobInfo update1 = gen1.toBuilder().setMetadata(meta3).build();

BlobInfo gen1_2 = storage.update(update1);

assertAll(
() -> assertThat(gen1_2.getMetadata()).isEqualTo(meta3),
() -> assertThat(gen1_2.getGeneration()).isEqualTo(gen1.getGeneration()));
}
}
Back | FazBrowse Home | New Git URL