googleapis · JesseLovelace · Mar 14, 2024 · Feb 8, 2024 · Feb 8, 2024 · Feb 8, 2024
diff --git a/README.md b/README.md
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-storage'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-storage:2.32.1'
+implementation 'com.google.cloud:google-cloud-storage:2.33.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.32.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.33.0"
 ```
 <!-- {x-version-update-end} -->
 
@@ -428,7 +428,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-storage/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-storage.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-storage/2.32.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-storage/2.33.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

@@ -21,6 +21,24 @@
  <method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
  </difference>
 
+ <difference>
+ <differenceType>7013</differenceType>
+ <className>com/google/cloud/storage/BucketInfo$Builder</className>
+ <method>com.google.cloud.storage.BucketInfo$Builder setSoftDeletePolicy(com.google.cloud.storage.BucketInfo$SoftDeletePolicy)</method>
+ </difference>
+
+ <difference>
+ <differenceType>7012</differenceType>
+ <className>com/google/cloud/storage/Storage</className>
+ <method>com.google.cloud.storage.Blob restore(com.google.cloud.storage.BlobId, com.google.cloud.storage.Storage$BlobRestoreOption[])</method>
+ </difference>
+
+ <difference>
+ <differenceType>7012</differenceType>
+ <className>com/google/cloud/storage/spi/v1/StorageRpc</className>
+ <method>com.google.api.services.storage.model.StorageObject restore(com.google.api.services.storage.model.StorageObject, java.util.Map)</method>
+ </difference>
+
  <!-- @BetaApi members -->
  <difference>
  <differenceType>7009</differenceType>

@@ -526,6 +526,18 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
  return this;
  }
 
+ @Override
+ Builder setSoftDeleteTime(OffsetDateTime softDeleteTime) {
+ infoBuilder.setSoftDeleteTime(softDeleteTime);
+ return this;
+ }
+
+ @Override
+ Builder setHardDeleteTime(OffsetDateTime hardDeleteTime) {
+ infoBuilder.setHardDeleteTime(hardDeleteTime);
+ return this;
+ }
+
  @Override
  public Builder setRetention(Retention retention) {
  infoBuilder.setRetention(retention);

@@ -108,6 +108,8 @@ public class BlobInfo implements Serializable {
  private final Boolean temporaryHold;
  private final OffsetDateTime retentionExpirationTime;
  private final Retention retention;
+ private final OffsetDateTime softDeleteTime;
+ private final OffsetDateTime hardDeleteTime;
  private final transient ImmutableSet<NamedField> modifiedFields;
 
  /** This class is meant for internal use only. Users are discouraged from using this class. */
@@ -525,6 +527,10 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
  return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
  }
 
+ abstract Builder setSoftDeleteTime(OffsetDateTime offsetDateTime);
+
+ abstract Builder setHardDeleteTime(OffsetDateTime hardDeleteTIme);
+
  public abstract Builder setRetention(Retention retention);
 
  /** Creates a {@code BlobInfo} object. */
@@ -626,6 +632,8 @@ static final class BuilderImpl extends Builder {
  private Boolean temporaryHold;
  private OffsetDateTime retentionExpirationTime;
  private Retention retention;
+ private OffsetDateTime softDeleteTime;
+ private OffsetDateTime hardDeleteTime;
  private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();
 
  BuilderImpl(BlobId blobId) {
@@ -664,6 +672,8 @@ static final class BuilderImpl extends Builder {
  temporaryHold = blobInfo.temporaryHold;
  retentionExpirationTime = blobInfo.retentionExpirationTime;
  retention = blobInfo.retention;
+ softDeleteTime = blobInfo.softDeleteTime;
+ hardDeleteTime = blobInfo.hardDeleteTime;
  }
 
  @Override
@@ -1037,6 +1047,24 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
  return this;
  }
 
+ @Override
+ Builder setSoftDeleteTime(OffsetDateTime softDeleteTime) {
+ if (!Objects.equals(this.softDeleteTime, softDeleteTime)) {
+ modifiedFields.add(BlobField.SOFT_DELETE_TIME);
+ }
+ this.softDeleteTime = softDeleteTime;
+ return this;
+ }
+
+ @Override
+ Builder setHardDeleteTime(OffsetDateTime hardDeleteTime) {
+ if (!Objects.equals(this.hardDeleteTime, hardDeleteTime)) {
+ modifiedFields.add(BlobField.HARD_DELETE_TIME);
+ }
+ this.hardDeleteTime = hardDeleteTime;
+ return this;
+ }
+
  @Override
  public Builder setRetention(Retention retention) {
  // todo: b/308194853
@@ -1269,6 +1297,8 @@ Builder clearRetentionExpirationTime() {
  temporaryHold = builder.temporaryHold;
  retentionExpirationTime = builder.retentionExpirationTime;
  retention = builder.retention;
+ softDeleteTime = builder.softDeleteTime;
+ hardDeleteTime = builder.hardDeleteTime;
  modifiedFields = builder.modifiedFields.build();
  }
 
@@ -1662,6 +1692,18 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
  return retentionExpirationTime;
  }
 
+ /** If this object has been soft-deleted, returns the time it was soft-deleted. */
+ public OffsetDateTime getSoftDeleteTime() {
+ return softDeleteTime;
+ }
+
+ /**
+ * If this object has been soft-deleted, returns the time at which it will be permanently deleted.
+ */
+ public OffsetDateTime getHardDeleteTime() {
+ return hardDeleteTime;
+ }
+
  /** Returns the object's Retention policy. */
  public Retention getRetention() {
  return retention;
@@ -1717,7 +1759,9 @@ public int hashCode() {
  eventBasedHold,
  temporaryHold,
  retention,
- retentionExpirationTime);
+ retentionExpirationTime,
+ softDeleteTime,
+ hardDeleteTime);
  }
 
  @Override
@@ -1759,7 +1803,9 @@ public boolean equals(Object o) {
  && Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
  && Objects.equals(temporaryHold, blobInfo.temporaryHold)
  && Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
- && Objects.equals(retention, blobInfo.retention);
+ && Objects.equals(retention, blobInfo.retention)
+ && Objects.equals(softDeleteTime, blobInfo.softDeleteTime)
+ && Objects.equals(hardDeleteTime, blobInfo.hardDeleteTime);
  }
 
  ImmutableSet<NamedField> getModifiedFields() {

@@ -748,6 +748,12 @@ Builder setObjectRetention(ObjectRetention objectRetention) {
  return this;
  }
 
+ @Override
+ public Builder setSoftDeletePolicy(SoftDeletePolicy softDeletePolicy) {
+ infoBuilder.setSoftDeletePolicy(softDeletePolicy);
+ return this;
+ }
+
  @Override
  public Bucket build() {
  return new Bucket(storage, infoBuilder);
@@ -1083,6 +1089,28 @@ public Blob get(String blob, BlobGetOption... options) {
  return storage.get(BlobId.of(getName(), blob), options);
  }
 
+ /**
+ * Returns the requested blob in this bucket of a specific generation or {@code null} if not
+ * found.
+ *
+ * <p>Example of getting a blob of a specific in the bucket.
+ *
+ * <pre>{@code
+ * String blobName = "my_blob_name";
+ * long generation = 42;
+ * Blob blob = bucket.get(blobName, generation);
+ * }</pre>
+ *
+ * @param blob name of the requested blob
+ * @param generation the generation to get
+ * @param options blob search options
+ * @throws StorageException upon failure
+ */
+ @TransportCompatibility({Transport.HTTP, Transport.GRPC})
+ public Blob get(String blob, Long generation, BlobGetOption... options) {
+ return storage.get(BlobId.of(getName(), blob, generation), options);
+ }
+
  /**
  * Returns a list of requested blobs in this bucket. Blobs that do not exist are null.
  *