Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,12 @@
<method>* writeAndClose(*)</method>
</difference>

<difference>
<differenceType>7013</differenceType>
<className>com/google/cloud/storage/BlobInfo$Builder</className>
<method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
</difference>

<!-- @BetaApi members -->
<difference>
<differenceType>7009</differenceType>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,12 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
infoBuilder.setRetention(retention);
return this;
}

@Override
public Blob build() {
return new Blob(storage, infoBuilder);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,10 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.util.Data;
import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.cloud.StringEnumType;
import com.google.cloud.StringEnumValue;
import com.google.cloud.storage.Storage.BlobField;
import com.google.cloud.storage.TransportCompatibility.Transport;
import com.google.cloud.storage.UnifiedOpts.NamedField;
Expand DownExpand Up@@ -104,6 +107,7 @@ public class BlobInfo implements Serializable {
private final Boolean eventBasedHold;
private final Boolean temporaryHold;
private final OffsetDateTime retentionExpirationTime;
private final Retention retention;
private final transient ImmutableSet<NamedField> modifiedFields;

/** This class is meant for internal use only. Users are discouraged from using this class. */
Expand DownExpand Up@@ -168,6 +172,119 @@ public final boolean equals(Object o) {
}
}

/**
* Defines a blob's Retention policy. Can only be used on objects in a retention-enabled bucket.
*/
public static final class Retention implements Serializable {

private static final long serialVersionUID = 5046718464542688444L;

private Mode mode;

private OffsetDateTime retainUntilTime;

/** Returns the retention policy's Mode. Can be Locked or Unlocked. */
public Mode getMode() {
return mode;
}

/** Returns what time this object will be retained until, if the mode is Locked. */
public OffsetDateTime getRetainUntilTime() {
return retainUntilTime;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Retention)) {
return false;
}
Retention that = (Retention) o;
return Objects.equals(mode, that.mode)
&& Objects.equals(retainUntilTime, that.retainUntilTime);
}

@Override
public int hashCode() {
return Objects.hash(mode, retainUntilTime);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mode", mode)
.add("retainUntilTime", retainUntilTime)
.toString();
}

public static Builder newBuilder() {
return new Builder();
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, do we usually do toBuilder() for the nested model classes or only the top level ones?


public Builder toBuilder() {
return new Builder().setMode(this.mode).setRetainUntilTime(this.retainUntilTime);
}

private Retention() {}

public Retention(Builder builder) {
this.mode = builder.mode;
this.retainUntilTime = builder.retainUntilTime;
}

public static final class Builder {
private Mode mode;
private OffsetDateTime retainUntilTime;

/** Sets the retention policy's Mode. Can be Locked or Unlocked. */
public Builder setMode(Mode mode) {
this.mode = mode;
return this;
}

/** Sets what time this object will be retained until, if the mode is Locked. */
public Builder setRetainUntilTime(OffsetDateTime retainUntilTime) {
this.retainUntilTime = retainUntilTime;
return this;
}

public Retention build() {
return new Retention(this);
}
}

public static final class Mode extends StringEnumValue {
private static final long serialVersionUID = 1973143582659557184L;

private Mode(String constant) {
super(constant);
}

private static final ApiFunction<String, Mode> CONSTRUCTOR = Mode::new;

private static final StringEnumType<Mode> type =
new StringEnumType<>(Mode.class, CONSTRUCTOR);

public static final Mode UNLOCKED = type.createAndRegister("Unlocked");

public static final Mode LOCKED = type.createAndRegister("Locked");

public static Mode valueOfStrict(String constant) {
return type.valueOfStrict(constant);
}

public static Mode valueOf(String constant) {
return type.valueOf(constant);
}

public static Mode[] values() {
return type.values();
}
}
}

/** Builder for {@code BlobInfo}. */
public abstract static class Builder {

Expand DownExpand Up@@ -408,6 +525,8 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
}

public abstract Builder setRetention(Retention retention);

/** Creates a {@code BlobInfo} object. */
public abstract BlobInfo build();

Expand DownExpand Up@@ -506,6 +625,7 @@ static final class BuilderImpl extends Builder {
private Boolean eventBasedHold;
private Boolean temporaryHold;
private OffsetDateTime retentionExpirationTime;
private Retention retention;
private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();

BuilderImpl(BlobId blobId) {
Expand DownExpand Up@@ -543,6 +663,7 @@ static final class BuilderImpl extends Builder {
eventBasedHold = blobInfo.eventBasedHold;
temporaryHold = blobInfo.temporaryHold;
retentionExpirationTime = blobInfo.retentionExpirationTime;
retention = blobInfo.retention;
}

@Override
Expand DownExpand Up@@ -916,6 +1037,14 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
// todo: b/308194853
modifiedFields.add(BlobField.RETENTION);
this.retention = retention;
return this;
}

@Override
public BlobInfo build() {
checkNotNull(blobId);
Expand DownExpand Up@@ -1139,6 +1268,7 @@ Builder clearRetentionExpirationTime() {
eventBasedHold = builder.eventBasedHold;
temporaryHold = builder.temporaryHold;
retentionExpirationTime = builder.retentionExpirationTime;
retention = builder.retention;
modifiedFields = builder.modifiedFields.build();
}

Expand DownExpand Up@@ -1532,6 +1662,11 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
return retentionExpirationTime;
}

/** Returns the object's Retention policy. */
public Retention getRetention() {
return retention;
}

/** Returns a builder for the current blob. */
public Builder toBuilder() {
return new BuilderImpl(this);
Expand DownExpand Up@@ -1581,6 +1716,7 @@ public int hashCode() {
kmsKeyName,
eventBasedHold,
temporaryHold,
retention,
retentionExpirationTime);
}

Expand DownExpand Up@@ -1622,7 +1758,8 @@ public boolean equals(Object o) {
&& Objects.equals(kmsKeyName, blobInfo.kmsKeyName)
&& Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
&& Objects.equals(temporaryHold, blobInfo.temporaryHold)
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime);
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
&& Objects.equals(retention, blobInfo.retention);
}

ImmutableSet<NamedField> getModifiedFields() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,6 +272,16 @@ public static BlobTargetOption userProject(@NonNull String userProject) {
return new BlobTargetOption(UnifiedOpts.userProject(userProject));
}

/**
* Returns an option for overriding an Unlocked Retention policy. This must be set to true in
* order to change a policy from Unlocked to Locked, to set it to null, or to reduce its
* retainUntilTime attribute.
*/
@TransportCompatibility({Transport.HTTP})
public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlockedRetention) {
return new BlobTargetOption(UnifiedOpts.overrideUnlockedRetention(overrideUnlockedRetention));
}

/**
* Deduplicate any options which are the same parameter. The value which comes last in {@code
* os} will be the value included in the return.
Expand DownExpand Up@@ -732,6 +742,12 @@ public Builder setCustomPlacementConfig(CustomPlacementConfig customPlacementCon
return this;
}

@Override
Builder setObjectRetention(ObjectRetention objectRetention) {
infoBuilder.setObjectRetention(objectRetention);
return this;
}

@Override
public Bucket build() {
return new Bucket(storage, infoBuilder);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,12 @@
<method>* writeAndClose(*)</method>
</difference>

<difference>
<differenceType>7013</differenceType>
<className>com/google/cloud/storage/BlobInfo$Builder</className>
<method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
</difference>

<!-- @BetaApi members -->
<difference>
<differenceType>7009</differenceType>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,12 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
infoBuilder.setRetention(retention);
return this;
}

@Override
public Blob build() {
return new Blob(storage, infoBuilder);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,10 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.util.Data;
import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.cloud.StringEnumType;
import com.google.cloud.StringEnumValue;
import com.google.cloud.storage.Storage.BlobField;
import com.google.cloud.storage.TransportCompatibility.Transport;
import com.google.cloud.storage.UnifiedOpts.NamedField;
Expand DownExpand Up@@ -104,6 +107,7 @@ public class BlobInfo implements Serializable {
private final Boolean eventBasedHold;
private final Boolean temporaryHold;
private final OffsetDateTime retentionExpirationTime;
private final Retention retention;
private final transient ImmutableSet<NamedField> modifiedFields;

/** This class is meant for internal use only. Users are discouraged from using this class. */
Expand DownExpand Up@@ -168,6 +172,119 @@ public final boolean equals(Object o) {
}
}

/**
* Defines a blob's Retention policy. Can only be used on objects in a retention-enabled bucket.
*/
public static final class Retention implements Serializable {

private static final long serialVersionUID = 5046718464542688444L;

private Mode mode;

private OffsetDateTime retainUntilTime;

/** Returns the retention policy's Mode. Can be Locked or Unlocked. */
public Mode getMode() {
return mode;
}

/** Returns what time this object will be retained until, if the mode is Locked. */
public OffsetDateTime getRetainUntilTime() {
return retainUntilTime;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Retention)) {
return false;
}
Retention that = (Retention) o;
return Objects.equals(mode, that.mode)
&& Objects.equals(retainUntilTime, that.retainUntilTime);
}

@Override
public int hashCode() {
return Objects.hash(mode, retainUntilTime);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mode", mode)
.add("retainUntilTime", retainUntilTime)
.toString();
}

public static Builder newBuilder() {
return new Builder();
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, do we usually do toBuilder() for the nested model classes or only the top level ones?


public Builder toBuilder() {
return new Builder().setMode(this.mode).setRetainUntilTime(this.retainUntilTime);
}

private Retention() {}

public Retention(Builder builder) {
this.mode = builder.mode;
this.retainUntilTime = builder.retainUntilTime;
}

public static final class Builder {
private Mode mode;
private OffsetDateTime retainUntilTime;

/** Sets the retention policy's Mode. Can be Locked or Unlocked. */
public Builder setMode(Mode mode) {
this.mode = mode;
return this;
}

/** Sets what time this object will be retained until, if the mode is Locked. */
public Builder setRetainUntilTime(OffsetDateTime retainUntilTime) {
this.retainUntilTime = retainUntilTime;
return this;
}

public Retention build() {
return new Retention(this);
}
}

public static final class Mode extends StringEnumValue {
private static final long serialVersionUID = 1973143582659557184L;

private Mode(String constant) {
super(constant);
}

private static final ApiFunction<String, Mode> CONSTRUCTOR = Mode::new;

private static final StringEnumType<Mode> type =
new StringEnumType<>(Mode.class, CONSTRUCTOR);

public static final Mode UNLOCKED = type.createAndRegister("Unlocked");

public static final Mode LOCKED = type.createAndRegister("Locked");

public static Mode valueOfStrict(String constant) {
return type.valueOfStrict(constant);
}

public static Mode valueOf(String constant) {
return type.valueOf(constant);
}

public static Mode[] values() {
return type.values();
}
}
}

/** Builder for {@code BlobInfo}. */
public abstract static class Builder {

Expand DownExpand Up@@ -408,6 +525,8 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
}

public abstract Builder setRetention(Retention retention);

/** Creates a {@code BlobInfo} object. */
public abstract BlobInfo build();

Expand DownExpand Up@@ -506,6 +625,7 @@ static final class BuilderImpl extends Builder {
private Boolean eventBasedHold;
private Boolean temporaryHold;
private OffsetDateTime retentionExpirationTime;
private Retention retention;
private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();

BuilderImpl(BlobId blobId) {
Expand DownExpand Up@@ -543,6 +663,7 @@ static final class BuilderImpl extends Builder {
eventBasedHold = blobInfo.eventBasedHold;
temporaryHold = blobInfo.temporaryHold;
retentionExpirationTime = blobInfo.retentionExpirationTime;
retention = blobInfo.retention;
}

@Override
Expand DownExpand Up@@ -916,6 +1037,14 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
// todo: b/308194853
modifiedFields.add(BlobField.RETENTION);
this.retention = retention;
return this;
}

@Override
public BlobInfo build() {
checkNotNull(blobId);
Expand DownExpand Up@@ -1139,6 +1268,7 @@ Builder clearRetentionExpirationTime() {
eventBasedHold = builder.eventBasedHold;
temporaryHold = builder.temporaryHold;
retentionExpirationTime = builder.retentionExpirationTime;
retention = builder.retention;
modifiedFields = builder.modifiedFields.build();
}

Expand DownExpand Up@@ -1532,6 +1662,11 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
return retentionExpirationTime;
}

/** Returns the object's Retention policy. */
public Retention getRetention() {
return retention;
}

/** Returns a builder for the current blob. */
public Builder toBuilder() {
return new BuilderImpl(this);
Expand DownExpand Up@@ -1581,6 +1716,7 @@ public int hashCode() {
kmsKeyName,
eventBasedHold,
temporaryHold,
retention,
retentionExpirationTime);
}

Expand DownExpand Up@@ -1622,7 +1758,8 @@ public boolean equals(Object o) {
&& Objects.equals(kmsKeyName, blobInfo.kmsKeyName)
&& Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
&& Objects.equals(temporaryHold, blobInfo.temporaryHold)
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime);
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
&& Objects.equals(retention, blobInfo.retention);
}

ImmutableSet<NamedField> getModifiedFields() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,6 +272,16 @@ public static BlobTargetOption userProject(@NonNull String userProject) {
return new BlobTargetOption(UnifiedOpts.userProject(userProject));
}

/**
* Returns an option for overriding an Unlocked Retention policy. This must be set to true in
* order to change a policy from Unlocked to Locked, to set it to null, or to reduce its
* retainUntilTime attribute.
*/
@TransportCompatibility({Transport.HTTP})
public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlockedRetention) {
return new BlobTargetOption(UnifiedOpts.overrideUnlockedRetention(overrideUnlockedRetention));
}

/**
* Deduplicate any options which are the same parameter. The value which comes last in {@code
* os} will be the value included in the return.
Expand DownExpand Up@@ -732,6 +742,12 @@ public Builder setCustomPlacementConfig(CustomPlacementConfig customPlacementCon
return this;
}

@Override
Builder setObjectRetention(ObjectRetention objectRetention) {
infoBuilder.setObjectRetention(objectRetention);
return this;
}

@Override
public Bucket build() {
return new Bucket(storage, infoBuilder);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,12 @@
<method>* writeAndClose(*)</method>
</difference>

<difference>
<differenceType>7013</differenceType>
<className>com/google/cloud/storage/BlobInfo$Builder</className>
<method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
</difference>

<!-- @BetaApi members -->
<difference>
<differenceType>7009</differenceType>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,12 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
infoBuilder.setRetention(retention);
return this;
}

@Override
public Blob build() {
return new Blob(storage, infoBuilder);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,10 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.util.Data;
import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.cloud.StringEnumType;
import com.google.cloud.StringEnumValue;
import com.google.cloud.storage.Storage.BlobField;
import com.google.cloud.storage.TransportCompatibility.Transport;
import com.google.cloud.storage.UnifiedOpts.NamedField;
Expand DownExpand Up@@ -104,6 +107,7 @@ public class BlobInfo implements Serializable {
private final Boolean eventBasedHold;
private final Boolean temporaryHold;
private final OffsetDateTime retentionExpirationTime;
private final Retention retention;
private final transient ImmutableSet<NamedField> modifiedFields;

/** This class is meant for internal use only. Users are discouraged from using this class. */
Expand DownExpand Up@@ -168,6 +172,119 @@ public final boolean equals(Object o) {
}
}

/**
* Defines a blob's Retention policy. Can only be used on objects in a retention-enabled bucket.
*/
public static final class Retention implements Serializable {

private static final long serialVersionUID = 5046718464542688444L;

private Mode mode;

private OffsetDateTime retainUntilTime;

/** Returns the retention policy's Mode. Can be Locked or Unlocked. */
public Mode getMode() {
return mode;
}

/** Returns what time this object will be retained until, if the mode is Locked. */
public OffsetDateTime getRetainUntilTime() {
return retainUntilTime;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Retention)) {
return false;
}
Retention that = (Retention) o;
return Objects.equals(mode, that.mode)
&& Objects.equals(retainUntilTime, that.retainUntilTime);
}

@Override
public int hashCode() {
return Objects.hash(mode, retainUntilTime);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mode", mode)
.add("retainUntilTime", retainUntilTime)
.toString();
}

public static Builder newBuilder() {
return new Builder();
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, do we usually do toBuilder() for the nested model classes or only the top level ones?


public Builder toBuilder() {
return new Builder().setMode(this.mode).setRetainUntilTime(this.retainUntilTime);
}

private Retention() {}

public Retention(Builder builder) {
this.mode = builder.mode;
this.retainUntilTime = builder.retainUntilTime;
}

public static final class Builder {
private Mode mode;
private OffsetDateTime retainUntilTime;

/** Sets the retention policy's Mode. Can be Locked or Unlocked. */
public Builder setMode(Mode mode) {
this.mode = mode;
return this;
}

/** Sets what time this object will be retained until, if the mode is Locked. */
public Builder setRetainUntilTime(OffsetDateTime retainUntilTime) {
this.retainUntilTime = retainUntilTime;
return this;
}

public Retention build() {
return new Retention(this);
}
}

public static final class Mode extends StringEnumValue {
private static final long serialVersionUID = 1973143582659557184L;

private Mode(String constant) {
super(constant);
}

private static final ApiFunction<String, Mode> CONSTRUCTOR = Mode::new;

private static final StringEnumType<Mode> type =
new StringEnumType<>(Mode.class, CONSTRUCTOR);

public static final Mode UNLOCKED = type.createAndRegister("Unlocked");

public static final Mode LOCKED = type.createAndRegister("Locked");

public static Mode valueOfStrict(String constant) {
return type.valueOfStrict(constant);
}

public static Mode valueOf(String constant) {
return type.valueOf(constant);
}

public static Mode[] values() {
return type.values();
}
}
}

/** Builder for {@code BlobInfo}. */
public abstract static class Builder {

Expand DownExpand Up@@ -408,6 +525,8 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
}

public abstract Builder setRetention(Retention retention);

/** Creates a {@code BlobInfo} object. */
public abstract BlobInfo build();

Expand DownExpand Up@@ -506,6 +625,7 @@ static final class BuilderImpl extends Builder {
private Boolean eventBasedHold;
private Boolean temporaryHold;
private OffsetDateTime retentionExpirationTime;
private Retention retention;
private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();

BuilderImpl(BlobId blobId) {
Expand DownExpand Up@@ -543,6 +663,7 @@ static final class BuilderImpl extends Builder {
eventBasedHold = blobInfo.eventBasedHold;
temporaryHold = blobInfo.temporaryHold;
retentionExpirationTime = blobInfo.retentionExpirationTime;
retention = blobInfo.retention;
}

@Override
Expand DownExpand Up@@ -916,6 +1037,14 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
// todo: b/308194853
modifiedFields.add(BlobField.RETENTION);
this.retention = retention;
return this;
}

@Override
public BlobInfo build() {
checkNotNull(blobId);
Expand DownExpand Up@@ -1139,6 +1268,7 @@ Builder clearRetentionExpirationTime() {
eventBasedHold = builder.eventBasedHold;
temporaryHold = builder.temporaryHold;
retentionExpirationTime = builder.retentionExpirationTime;
retention = builder.retention;
modifiedFields = builder.modifiedFields.build();
}

Expand DownExpand Up@@ -1532,6 +1662,11 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
return retentionExpirationTime;
}

/** Returns the object's Retention policy. */
public Retention getRetention() {
return retention;
}

/** Returns a builder for the current blob. */
public Builder toBuilder() {
return new BuilderImpl(this);
Expand DownExpand Up@@ -1581,6 +1716,7 @@ public int hashCode() {
kmsKeyName,
eventBasedHold,
temporaryHold,
retention,
retentionExpirationTime);
}

Expand DownExpand Up@@ -1622,7 +1758,8 @@ public boolean equals(Object o) {
&& Objects.equals(kmsKeyName, blobInfo.kmsKeyName)
&& Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
&& Objects.equals(temporaryHold, blobInfo.temporaryHold)
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime);
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
&& Objects.equals(retention, blobInfo.retention);
}

ImmutableSet<NamedField> getModifiedFields() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,6 +272,16 @@ public static BlobTargetOption userProject(@NonNull String userProject) {
return new BlobTargetOption(UnifiedOpts.userProject(userProject));
}

/**
* Returns an option for overriding an Unlocked Retention policy. This must be set to true in
* order to change a policy from Unlocked to Locked, to set it to null, or to reduce its
* retainUntilTime attribute.
*/
@TransportCompatibility({Transport.HTTP})
public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlockedRetention) {
return new BlobTargetOption(UnifiedOpts.overrideUnlockedRetention(overrideUnlockedRetention));
}

/**
* Deduplicate any options which are the same parameter. The value which comes last in {@code
* os} will be the value included in the return.
Expand DownExpand Up@@ -732,6 +742,12 @@ public Builder setCustomPlacementConfig(CustomPlacementConfig customPlacementCon
return this;
}

@Override
Builder setObjectRetention(ObjectRetention objectRetention) {
infoBuilder.setObjectRetention(objectRetention);
return this;
}

@Override
public Bucket build() {
return new Bucket(storage, infoBuilder);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,12 @@
<method>* writeAndClose(*)</method>
</difference>

<difference>
<differenceType>7013</differenceType>
<className>com/google/cloud/storage/BlobInfo$Builder</className>
<method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
</difference>

<!-- @BetaApi members -->
<difference>
<differenceType>7009</differenceType>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,12 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
infoBuilder.setRetention(retention);
return this;
}

@Override
public Blob build() {
return new Blob(storage, infoBuilder);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,10 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.util.Data;
import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.cloud.StringEnumType;
import com.google.cloud.StringEnumValue;
import com.google.cloud.storage.Storage.BlobField;
import com.google.cloud.storage.TransportCompatibility.Transport;
import com.google.cloud.storage.UnifiedOpts.NamedField;
Expand DownExpand Up@@ -104,6 +107,7 @@ public class BlobInfo implements Serializable {
private final Boolean eventBasedHold;
private final Boolean temporaryHold;
private final OffsetDateTime retentionExpirationTime;
private final Retention retention;
private final transient ImmutableSet<NamedField> modifiedFields;

/** This class is meant for internal use only. Users are discouraged from using this class. */
Expand DownExpand Up@@ -168,6 +172,119 @@ public final boolean equals(Object o) {
}
}

/**
* Defines a blob's Retention policy. Can only be used on objects in a retention-enabled bucket.
*/
public static final class Retention implements Serializable {

private static final long serialVersionUID = 5046718464542688444L;

private Mode mode;

private OffsetDateTime retainUntilTime;

/** Returns the retention policy's Mode. Can be Locked or Unlocked. */
public Mode getMode() {
return mode;
}

/** Returns what time this object will be retained until, if the mode is Locked. */
public OffsetDateTime getRetainUntilTime() {
return retainUntilTime;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Retention)) {
return false;
}
Retention that = (Retention) o;
return Objects.equals(mode, that.mode)
&& Objects.equals(retainUntilTime, that.retainUntilTime);
}

@Override
public int hashCode() {
return Objects.hash(mode, retainUntilTime);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mode", mode)
.add("retainUntilTime", retainUntilTime)
.toString();
}

public static Builder newBuilder() {
return new Builder();
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, do we usually do toBuilder() for the nested model classes or only the top level ones?


public Builder toBuilder() {
return new Builder().setMode(this.mode).setRetainUntilTime(this.retainUntilTime);
}

private Retention() {}

public Retention(Builder builder) {
this.mode = builder.mode;
this.retainUntilTime = builder.retainUntilTime;
}

public static final class Builder {
private Mode mode;
private OffsetDateTime retainUntilTime;

/** Sets the retention policy's Mode. Can be Locked or Unlocked. */
public Builder setMode(Mode mode) {
this.mode = mode;
return this;
}

/** Sets what time this object will be retained until, if the mode is Locked. */
public Builder setRetainUntilTime(OffsetDateTime retainUntilTime) {
this.retainUntilTime = retainUntilTime;
return this;
}

public Retention build() {
return new Retention(this);
}
}

public static final class Mode extends StringEnumValue {
private static final long serialVersionUID = 1973143582659557184L;

private Mode(String constant) {
super(constant);
}

private static final ApiFunction<String, Mode> CONSTRUCTOR = Mode::new;

private static final StringEnumType<Mode> type =
new StringEnumType<>(Mode.class, CONSTRUCTOR);

public static final Mode UNLOCKED = type.createAndRegister("Unlocked");

public static final Mode LOCKED = type.createAndRegister("Locked");

public static Mode valueOfStrict(String constant) {
return type.valueOfStrict(constant);
}

public static Mode valueOf(String constant) {
return type.valueOf(constant);
}

public static Mode[] values() {
return type.values();
}
}
}

/** Builder for {@code BlobInfo}. */
public abstract static class Builder {

Expand DownExpand Up@@ -408,6 +525,8 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
}

public abstract Builder setRetention(Retention retention);

/** Creates a {@code BlobInfo} object. */
public abstract BlobInfo build();

Expand DownExpand Up@@ -506,6 +625,7 @@ static final class BuilderImpl extends Builder {
private Boolean eventBasedHold;
private Boolean temporaryHold;
private OffsetDateTime retentionExpirationTime;
private Retention retention;
private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();

BuilderImpl(BlobId blobId) {
Expand DownExpand Up@@ -543,6 +663,7 @@ static final class BuilderImpl extends Builder {
eventBasedHold = blobInfo.eventBasedHold;
temporaryHold = blobInfo.temporaryHold;
retentionExpirationTime = blobInfo.retentionExpirationTime;
retention = blobInfo.retention;
}

@Override
Expand DownExpand Up@@ -916,6 +1037,14 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
// todo: b/308194853
modifiedFields.add(BlobField.RETENTION);
this.retention = retention;
return this;
}

@Override
public BlobInfo build() {
checkNotNull(blobId);
Expand DownExpand Up@@ -1139,6 +1268,7 @@ Builder clearRetentionExpirationTime() {
eventBasedHold = builder.eventBasedHold;
temporaryHold = builder.temporaryHold;
retentionExpirationTime = builder.retentionExpirationTime;
retention = builder.retention;
modifiedFields = builder.modifiedFields.build();
}

Expand DownExpand Up@@ -1532,6 +1662,11 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
return retentionExpirationTime;
}

/** Returns the object's Retention policy. */
public Retention getRetention() {
return retention;
}

/** Returns a builder for the current blob. */
public Builder toBuilder() {
return new BuilderImpl(this);
Expand DownExpand Up@@ -1581,6 +1716,7 @@ public int hashCode() {
kmsKeyName,
eventBasedHold,
temporaryHold,
retention,
retentionExpirationTime);
}

Expand DownExpand Up@@ -1622,7 +1758,8 @@ public boolean equals(Object o) {
&& Objects.equals(kmsKeyName, blobInfo.kmsKeyName)
&& Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
&& Objects.equals(temporaryHold, blobInfo.temporaryHold)
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime);
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
&& Objects.equals(retention, blobInfo.retention);
}

ImmutableSet<NamedField> getModifiedFields() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,6 +272,16 @@ public static BlobTargetOption userProject(@NonNull String userProject) {
return new BlobTargetOption(UnifiedOpts.userProject(userProject));
}

/**
* Returns an option for overriding an Unlocked Retention policy. This must be set to true in
* order to change a policy from Unlocked to Locked, to set it to null, or to reduce its
* retainUntilTime attribute.
*/
@TransportCompatibility({Transport.HTTP})
public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlockedRetention) {
return new BlobTargetOption(UnifiedOpts.overrideUnlockedRetention(overrideUnlockedRetention));
}

/**
* Deduplicate any options which are the same parameter. The value which comes last in {@code
* os} will be the value included in the return.
Expand DownExpand Up@@ -732,6 +742,12 @@ public Builder setCustomPlacementConfig(CustomPlacementConfig customPlacementCon
return this;
}

@Override
Builder setObjectRetention(ObjectRetention objectRetention) {
infoBuilder.setObjectRetention(objectRetention);
return this;
}

@Override
public Bucket build() {
return new Bucket(storage, infoBuilder);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,12 @@
<method>* writeAndClose(*)</method>
</difference>

<difference>
<differenceType>7013</differenceType>
<className>com/google/cloud/storage/BlobInfo$Builder</className>
<method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
</difference>

<!-- @BetaApi members -->
<difference>
<differenceType>7009</differenceType>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,12 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
infoBuilder.setRetention(retention);
return this;
}

@Override
public Blob build() {
return new Blob(storage, infoBuilder);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,10 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.util.Data;
import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.cloud.StringEnumType;
import com.google.cloud.StringEnumValue;
import com.google.cloud.storage.Storage.BlobField;
import com.google.cloud.storage.TransportCompatibility.Transport;
import com.google.cloud.storage.UnifiedOpts.NamedField;
Expand DownExpand Up@@ -104,6 +107,7 @@ public class BlobInfo implements Serializable {
private final Boolean eventBasedHold;
private final Boolean temporaryHold;
private final OffsetDateTime retentionExpirationTime;
private final Retention retention;
private final transient ImmutableSet<NamedField> modifiedFields;

/** This class is meant for internal use only. Users are discouraged from using this class. */
Expand DownExpand Up@@ -168,6 +172,119 @@ public final boolean equals(Object o) {
}
}

/**
* Defines a blob's Retention policy. Can only be used on objects in a retention-enabled bucket.
*/
public static final class Retention implements Serializable {

private static final long serialVersionUID = 5046718464542688444L;

private Mode mode;

private OffsetDateTime retainUntilTime;

/** Returns the retention policy's Mode. Can be Locked or Unlocked. */
public Mode getMode() {
return mode;
}

/** Returns what time this object will be retained until, if the mode is Locked. */
public OffsetDateTime getRetainUntilTime() {
return retainUntilTime;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Retention)) {
return false;
}
Retention that = (Retention) o;
return Objects.equals(mode, that.mode)
&& Objects.equals(retainUntilTime, that.retainUntilTime);
}

@Override
public int hashCode() {
return Objects.hash(mode, retainUntilTime);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mode", mode)
.add("retainUntilTime", retainUntilTime)
.toString();
}

public static Builder newBuilder() {
return new Builder();
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, do we usually do toBuilder() for the nested model classes or only the top level ones?


public Builder toBuilder() {
return new Builder().setMode(this.mode).setRetainUntilTime(this.retainUntilTime);
}

private Retention() {}

public Retention(Builder builder) {
this.mode = builder.mode;
this.retainUntilTime = builder.retainUntilTime;
}

public static final class Builder {
private Mode mode;
private OffsetDateTime retainUntilTime;

/** Sets the retention policy's Mode. Can be Locked or Unlocked. */
public Builder setMode(Mode mode) {
this.mode = mode;
return this;
}

/** Sets what time this object will be retained until, if the mode is Locked. */
public Builder setRetainUntilTime(OffsetDateTime retainUntilTime) {
this.retainUntilTime = retainUntilTime;
return this;
}

public Retention build() {
return new Retention(this);
}
}

public static final class Mode extends StringEnumValue {
private static final long serialVersionUID = 1973143582659557184L;

private Mode(String constant) {
super(constant);
}

private static final ApiFunction<String, Mode> CONSTRUCTOR = Mode::new;

private static final StringEnumType<Mode> type =
new StringEnumType<>(Mode.class, CONSTRUCTOR);

public static final Mode UNLOCKED = type.createAndRegister("Unlocked");

public static final Mode LOCKED = type.createAndRegister("Locked");

public static Mode valueOfStrict(String constant) {
return type.valueOfStrict(constant);
}

public static Mode valueOf(String constant) {
return type.valueOf(constant);
}

public static Mode[] values() {
return type.values();
}
}
}

/** Builder for {@code BlobInfo}. */
public abstract static class Builder {

Expand DownExpand Up@@ -408,6 +525,8 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
}

public abstract Builder setRetention(Retention retention);

/** Creates a {@code BlobInfo} object. */
public abstract BlobInfo build();

Expand DownExpand Up@@ -506,6 +625,7 @@ static final class BuilderImpl extends Builder {
private Boolean eventBasedHold;
private Boolean temporaryHold;
private OffsetDateTime retentionExpirationTime;
private Retention retention;
private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();

BuilderImpl(BlobId blobId) {
Expand DownExpand Up@@ -543,6 +663,7 @@ static final class BuilderImpl extends Builder {
eventBasedHold = blobInfo.eventBasedHold;
temporaryHold = blobInfo.temporaryHold;
retentionExpirationTime = blobInfo.retentionExpirationTime;
retention = blobInfo.retention;
}

@Override
Expand DownExpand Up@@ -916,6 +1037,14 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
// todo: b/308194853
modifiedFields.add(BlobField.RETENTION);
this.retention = retention;
return this;
}

@Override
public BlobInfo build() {
checkNotNull(blobId);
Expand DownExpand Up@@ -1139,6 +1268,7 @@ Builder clearRetentionExpirationTime() {
eventBasedHold = builder.eventBasedHold;
temporaryHold = builder.temporaryHold;
retentionExpirationTime = builder.retentionExpirationTime;
retention = builder.retention;
modifiedFields = builder.modifiedFields.build();
}

Expand DownExpand Up@@ -1532,6 +1662,11 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
return retentionExpirationTime;
}

/** Returns the object's Retention policy. */
public Retention getRetention() {
return retention;
}

/** Returns a builder for the current blob. */
public Builder toBuilder() {
return new BuilderImpl(this);
Expand DownExpand Up@@ -1581,6 +1716,7 @@ public int hashCode() {
kmsKeyName,
eventBasedHold,
temporaryHold,
retention,
retentionExpirationTime);
}

Expand DownExpand Up@@ -1622,7 +1758,8 @@ public boolean equals(Object o) {
&& Objects.equals(kmsKeyName, blobInfo.kmsKeyName)
&& Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
&& Objects.equals(temporaryHold, blobInfo.temporaryHold)
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime);
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
&& Objects.equals(retention, blobInfo.retention);
}

ImmutableSet<NamedField> getModifiedFields() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,6 +272,16 @@ public static BlobTargetOption userProject(@NonNull String userProject) {
return new BlobTargetOption(UnifiedOpts.userProject(userProject));
}

/**
* Returns an option for overriding an Unlocked Retention policy. This must be set to true in
* order to change a policy from Unlocked to Locked, to set it to null, or to reduce its
* retainUntilTime attribute.
*/
@TransportCompatibility({Transport.HTTP})
public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlockedRetention) {
return new BlobTargetOption(UnifiedOpts.overrideUnlockedRetention(overrideUnlockedRetention));
}

/**
* Deduplicate any options which are the same parameter. The value which comes last in {@code
* os} will be the value included in the return.
Expand DownExpand Up@@ -732,6 +742,12 @@ public Builder setCustomPlacementConfig(CustomPlacementConfig customPlacementCon
return this;
}

@Override
Builder setObjectRetention(ObjectRetention objectRetention) {
infoBuilder.setObjectRetention(objectRetention);
return this;
}

@Override
public Bucket build() {
return new Bucket(storage, infoBuilder);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,12 @@
<method>* writeAndClose(*)</method>
</difference>

<difference>
<differenceType>7013</differenceType>
<className>com/google/cloud/storage/BlobInfo$Builder</className>
<method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
</difference>

<!-- @BetaApi members -->
<difference>
<differenceType>7009</differenceType>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,12 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
infoBuilder.setRetention(retention);
return this;
}

@Override
public Blob build() {
return new Blob(storage, infoBuilder);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,10 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.util.Data;
import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.cloud.StringEnumType;
import com.google.cloud.StringEnumValue;
import com.google.cloud.storage.Storage.BlobField;
import com.google.cloud.storage.TransportCompatibility.Transport;
import com.google.cloud.storage.UnifiedOpts.NamedField;
Expand DownExpand Up@@ -104,6 +107,7 @@ public class BlobInfo implements Serializable {
private final Boolean eventBasedHold;
private final Boolean temporaryHold;
private final OffsetDateTime retentionExpirationTime;
private final Retention retention;
private final transient ImmutableSet<NamedField> modifiedFields;

/** This class is meant for internal use only. Users are discouraged from using this class. */
Expand DownExpand Up@@ -168,6 +172,119 @@ public final boolean equals(Object o) {
}
}

/**
* Defines a blob's Retention policy. Can only be used on objects in a retention-enabled bucket.
*/
public static final class Retention implements Serializable {

private static final long serialVersionUID = 5046718464542688444L;

private Mode mode;

private OffsetDateTime retainUntilTime;

/** Returns the retention policy's Mode. Can be Locked or Unlocked. */
public Mode getMode() {
return mode;
}

/** Returns what time this object will be retained until, if the mode is Locked. */
public OffsetDateTime getRetainUntilTime() {
return retainUntilTime;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Retention)) {
return false;
}
Retention that = (Retention) o;
return Objects.equals(mode, that.mode)
&& Objects.equals(retainUntilTime, that.retainUntilTime);
}

@Override
public int hashCode() {
return Objects.hash(mode, retainUntilTime);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mode", mode)
.add("retainUntilTime", retainUntilTime)
.toString();
}

public static Builder newBuilder() {
return new Builder();
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, do we usually do toBuilder() for the nested model classes or only the top level ones?


public Builder toBuilder() {
return new Builder().setMode(this.mode).setRetainUntilTime(this.retainUntilTime);
}

private Retention() {}

public Retention(Builder builder) {
this.mode = builder.mode;
this.retainUntilTime = builder.retainUntilTime;
}

public static final class Builder {
private Mode mode;
private OffsetDateTime retainUntilTime;

/** Sets the retention policy's Mode. Can be Locked or Unlocked. */
public Builder setMode(Mode mode) {
this.mode = mode;
return this;
}

/** Sets what time this object will be retained until, if the mode is Locked. */
public Builder setRetainUntilTime(OffsetDateTime retainUntilTime) {
this.retainUntilTime = retainUntilTime;
return this;
}

public Retention build() {
return new Retention(this);
}
}

public static final class Mode extends StringEnumValue {
private static final long serialVersionUID = 1973143582659557184L;

private Mode(String constant) {
super(constant);
}

private static final ApiFunction<String, Mode> CONSTRUCTOR = Mode::new;

private static final StringEnumType<Mode> type =
new StringEnumType<>(Mode.class, CONSTRUCTOR);

public static final Mode UNLOCKED = type.createAndRegister("Unlocked");

public static final Mode LOCKED = type.createAndRegister("Locked");

public static Mode valueOfStrict(String constant) {
return type.valueOfStrict(constant);
}

public static Mode valueOf(String constant) {
return type.valueOf(constant);
}

public static Mode[] values() {
return type.values();
}
}
}

/** Builder for {@code BlobInfo}. */
public abstract static class Builder {

Expand DownExpand Up@@ -408,6 +525,8 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
}

public abstract Builder setRetention(Retention retention);

/** Creates a {@code BlobInfo} object. */
public abstract BlobInfo build();

Expand DownExpand Up@@ -506,6 +625,7 @@ static final class BuilderImpl extends Builder {
private Boolean eventBasedHold;
private Boolean temporaryHold;
private OffsetDateTime retentionExpirationTime;
private Retention retention;
private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();

BuilderImpl(BlobId blobId) {
Expand DownExpand Up@@ -543,6 +663,7 @@ static final class BuilderImpl extends Builder {
eventBasedHold = blobInfo.eventBasedHold;
temporaryHold = blobInfo.temporaryHold;
retentionExpirationTime = blobInfo.retentionExpirationTime;
retention = blobInfo.retention;
}

@Override
Expand DownExpand Up@@ -916,6 +1037,14 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
// todo: b/308194853
modifiedFields.add(BlobField.RETENTION);
this.retention = retention;
return this;
}

@Override
public BlobInfo build() {
checkNotNull(blobId);
Expand DownExpand Up@@ -1139,6 +1268,7 @@ Builder clearRetentionExpirationTime() {
eventBasedHold = builder.eventBasedHold;
temporaryHold = builder.temporaryHold;
retentionExpirationTime = builder.retentionExpirationTime;
retention = builder.retention;
modifiedFields = builder.modifiedFields.build();
}

Expand DownExpand Up@@ -1532,6 +1662,11 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
return retentionExpirationTime;
}

/** Returns the object's Retention policy. */
public Retention getRetention() {
return retention;
}

/** Returns a builder for the current blob. */
public Builder toBuilder() {
return new BuilderImpl(this);
Expand DownExpand Up@@ -1581,6 +1716,7 @@ public int hashCode() {
kmsKeyName,
eventBasedHold,
temporaryHold,
retention,
retentionExpirationTime);
}

Expand DownExpand Up@@ -1622,7 +1758,8 @@ public boolean equals(Object o) {
&& Objects.equals(kmsKeyName, blobInfo.kmsKeyName)
&& Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
&& Objects.equals(temporaryHold, blobInfo.temporaryHold)
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime);
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
&& Objects.equals(retention, blobInfo.retention);
}

ImmutableSet<NamedField> getModifiedFields() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,6 +272,16 @@ public static BlobTargetOption userProject(@NonNull String userProject) {
return new BlobTargetOption(UnifiedOpts.userProject(userProject));
}

/**
* Returns an option for overriding an Unlocked Retention policy. This must be set to true in
* order to change a policy from Unlocked to Locked, to set it to null, or to reduce its
* retainUntilTime attribute.
*/
@TransportCompatibility({Transport.HTTP})
public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlockedRetention) {
return new BlobTargetOption(UnifiedOpts.overrideUnlockedRetention(overrideUnlockedRetention));
}

/**
* Deduplicate any options which are the same parameter. The value which comes last in {@code
* os} will be the value included in the return.
Expand DownExpand Up@@ -732,6 +742,12 @@ public Builder setCustomPlacementConfig(CustomPlacementConfig customPlacementCon
return this;
}

@Override
Builder setObjectRetention(ObjectRetention objectRetention) {
infoBuilder.setObjectRetention(objectRetention);
return this;
}

@Override
public Bucket build() {
return new Bucket(storage, infoBuilder);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,12 @@
<method>* writeAndClose(*)</method>
</difference>

<difference>
<differenceType>7013</differenceType>
<className>com/google/cloud/storage/BlobInfo$Builder</className>
<method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
</difference>

<!-- @BetaApi members -->
<difference>
<differenceType>7009</differenceType>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,12 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
infoBuilder.setRetention(retention);
return this;
}

@Override
public Blob build() {
return new Blob(storage, infoBuilder);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,10 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.util.Data;
import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.cloud.StringEnumType;
import com.google.cloud.StringEnumValue;
import com.google.cloud.storage.Storage.BlobField;
import com.google.cloud.storage.TransportCompatibility.Transport;
import com.google.cloud.storage.UnifiedOpts.NamedField;
Expand DownExpand Up@@ -104,6 +107,7 @@ public class BlobInfo implements Serializable {
private final Boolean eventBasedHold;
private final Boolean temporaryHold;
private final OffsetDateTime retentionExpirationTime;
private final Retention retention;
private final transient ImmutableSet<NamedField> modifiedFields;

/** This class is meant for internal use only. Users are discouraged from using this class. */
Expand DownExpand Up@@ -168,6 +172,119 @@ public final boolean equals(Object o) {
}
}

/**
* Defines a blob's Retention policy. Can only be used on objects in a retention-enabled bucket.
*/
public static final class Retention implements Serializable {

private static final long serialVersionUID = 5046718464542688444L;

private Mode mode;

private OffsetDateTime retainUntilTime;

/** Returns the retention policy's Mode. Can be Locked or Unlocked. */
public Mode getMode() {
return mode;
}

/** Returns what time this object will be retained until, if the mode is Locked. */
public OffsetDateTime getRetainUntilTime() {
return retainUntilTime;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Retention)) {
return false;
}
Retention that = (Retention) o;
return Objects.equals(mode, that.mode)
&& Objects.equals(retainUntilTime, that.retainUntilTime);
}

@Override
public int hashCode() {
return Objects.hash(mode, retainUntilTime);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mode", mode)
.add("retainUntilTime", retainUntilTime)
.toString();
}

public static Builder newBuilder() {
return new Builder();
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, do we usually do toBuilder() for the nested model classes or only the top level ones?


public Builder toBuilder() {
return new Builder().setMode(this.mode).setRetainUntilTime(this.retainUntilTime);
}

private Retention() {}

public Retention(Builder builder) {
this.mode = builder.mode;
this.retainUntilTime = builder.retainUntilTime;
}

public static final class Builder {
private Mode mode;
private OffsetDateTime retainUntilTime;

/** Sets the retention policy's Mode. Can be Locked or Unlocked. */
public Builder setMode(Mode mode) {
this.mode = mode;
return this;
}

/** Sets what time this object will be retained until, if the mode is Locked. */
public Builder setRetainUntilTime(OffsetDateTime retainUntilTime) {
this.retainUntilTime = retainUntilTime;
return this;
}

public Retention build() {
return new Retention(this);
}
}

public static final class Mode extends StringEnumValue {
private static final long serialVersionUID = 1973143582659557184L;

private Mode(String constant) {
super(constant);
}

private static final ApiFunction<String, Mode> CONSTRUCTOR = Mode::new;

private static final StringEnumType<Mode> type =
new StringEnumType<>(Mode.class, CONSTRUCTOR);

public static final Mode UNLOCKED = type.createAndRegister("Unlocked");

public static final Mode LOCKED = type.createAndRegister("Locked");

public static Mode valueOfStrict(String constant) {
return type.valueOfStrict(constant);
}

public static Mode valueOf(String constant) {
return type.valueOf(constant);
}

public static Mode[] values() {
return type.values();
}
}
}

/** Builder for {@code BlobInfo}. */
public abstract static class Builder {

Expand DownExpand Up@@ -408,6 +525,8 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
}

public abstract Builder setRetention(Retention retention);

/** Creates a {@code BlobInfo} object. */
public abstract BlobInfo build();

Expand DownExpand Up@@ -506,6 +625,7 @@ static final class BuilderImpl extends Builder {
private Boolean eventBasedHold;
private Boolean temporaryHold;
private OffsetDateTime retentionExpirationTime;
private Retention retention;
private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();

BuilderImpl(BlobId blobId) {
Expand DownExpand Up@@ -543,6 +663,7 @@ static final class BuilderImpl extends Builder {
eventBasedHold = blobInfo.eventBasedHold;
temporaryHold = blobInfo.temporaryHold;
retentionExpirationTime = blobInfo.retentionExpirationTime;
retention = blobInfo.retention;
}

@Override
Expand DownExpand Up@@ -916,6 +1037,14 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
// todo: b/308194853
modifiedFields.add(BlobField.RETENTION);
this.retention = retention;
return this;
}

@Override
public BlobInfo build() {
checkNotNull(blobId);
Expand DownExpand Up@@ -1139,6 +1268,7 @@ Builder clearRetentionExpirationTime() {
eventBasedHold = builder.eventBasedHold;
temporaryHold = builder.temporaryHold;
retentionExpirationTime = builder.retentionExpirationTime;
retention = builder.retention;
modifiedFields = builder.modifiedFields.build();
}

Expand DownExpand Up@@ -1532,6 +1662,11 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
return retentionExpirationTime;
}

/** Returns the object's Retention policy. */
public Retention getRetention() {
return retention;
}

/** Returns a builder for the current blob. */
public Builder toBuilder() {
return new BuilderImpl(this);
Expand DownExpand Up@@ -1581,6 +1716,7 @@ public int hashCode() {
kmsKeyName,
eventBasedHold,
temporaryHold,
retention,
retentionExpirationTime);
}

Expand DownExpand Up@@ -1622,7 +1758,8 @@ public boolean equals(Object o) {
&& Objects.equals(kmsKeyName, blobInfo.kmsKeyName)
&& Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
&& Objects.equals(temporaryHold, blobInfo.temporaryHold)
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime);
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
&& Objects.equals(retention, blobInfo.retention);
}

ImmutableSet<NamedField> getModifiedFields() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,6 +272,16 @@ public static BlobTargetOption userProject(@NonNull String userProject) {
return new BlobTargetOption(UnifiedOpts.userProject(userProject));
}

/**
* Returns an option for overriding an Unlocked Retention policy. This must be set to true in
* order to change a policy from Unlocked to Locked, to set it to null, or to reduce its
* retainUntilTime attribute.
*/
@TransportCompatibility({Transport.HTTP})
public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlockedRetention) {
return new BlobTargetOption(UnifiedOpts.overrideUnlockedRetention(overrideUnlockedRetention));
}

/**
* Deduplicate any options which are the same parameter. The value which comes last in {@code
* os} will be the value included in the return.
Expand DownExpand Up@@ -732,6 +742,12 @@ public Builder setCustomPlacementConfig(CustomPlacementConfig customPlacementCon
return this;
}

@Override
Builder setObjectRetention(ObjectRetention objectRetention) {
infoBuilder.setObjectRetention(objectRetention);
return this;
}

@Override
public Bucket build() {
return new Bucket(storage, infoBuilder);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,12 @@
<method>* writeAndClose(*)</method>
</difference>

<difference>
<differenceType>7013</differenceType>
<className>com/google/cloud/storage/BlobInfo$Builder</className>
<method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
</difference>

<!-- @BetaApi members -->
<difference>
<differenceType>7009</differenceType>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,12 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
infoBuilder.setRetention(retention);
return this;
}

@Override
public Blob build() {
return new Blob(storage, infoBuilder);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,10 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.util.Data;
import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.cloud.StringEnumType;
import com.google.cloud.StringEnumValue;
import com.google.cloud.storage.Storage.BlobField;
import com.google.cloud.storage.TransportCompatibility.Transport;
import com.google.cloud.storage.UnifiedOpts.NamedField;
Expand DownExpand Up@@ -104,6 +107,7 @@ public class BlobInfo implements Serializable {
private final Boolean eventBasedHold;
private final Boolean temporaryHold;
private final OffsetDateTime retentionExpirationTime;
private final Retention retention;
private final transient ImmutableSet<NamedField> modifiedFields;

/** This class is meant for internal use only. Users are discouraged from using this class. */
Expand DownExpand Up@@ -168,6 +172,119 @@ public final boolean equals(Object o) {
}
}

/**
* Defines a blob's Retention policy. Can only be used on objects in a retention-enabled bucket.
*/
public static final class Retention implements Serializable {

private static final long serialVersionUID = 5046718464542688444L;

private Mode mode;

private OffsetDateTime retainUntilTime;

/** Returns the retention policy's Mode. Can be Locked or Unlocked. */
public Mode getMode() {
return mode;
}

/** Returns what time this object will be retained until, if the mode is Locked. */
public OffsetDateTime getRetainUntilTime() {
return retainUntilTime;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Retention)) {
return false;
}
Retention that = (Retention) o;
return Objects.equals(mode, that.mode)
&& Objects.equals(retainUntilTime, that.retainUntilTime);
}

@Override
public int hashCode() {
return Objects.hash(mode, retainUntilTime);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mode", mode)
.add("retainUntilTime", retainUntilTime)
.toString();
}

public static Builder newBuilder() {
return new Builder();
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, do we usually do toBuilder() for the nested model classes or only the top level ones?


public Builder toBuilder() {
return new Builder().setMode(this.mode).setRetainUntilTime(this.retainUntilTime);
}

private Retention() {}

public Retention(Builder builder) {
this.mode = builder.mode;
this.retainUntilTime = builder.retainUntilTime;
}

public static final class Builder {
private Mode mode;
private OffsetDateTime retainUntilTime;

/** Sets the retention policy's Mode. Can be Locked or Unlocked. */
public Builder setMode(Mode mode) {
this.mode = mode;
return this;
}

/** Sets what time this object will be retained until, if the mode is Locked. */
public Builder setRetainUntilTime(OffsetDateTime retainUntilTime) {
this.retainUntilTime = retainUntilTime;
return this;
}

public Retention build() {
return new Retention(this);
}
}

public static final class Mode extends StringEnumValue {
private static final long serialVersionUID = 1973143582659557184L;

private Mode(String constant) {
super(constant);
}

private static final ApiFunction<String, Mode> CONSTRUCTOR = Mode::new;

private static final StringEnumType<Mode> type =
new StringEnumType<>(Mode.class, CONSTRUCTOR);

public static final Mode UNLOCKED = type.createAndRegister("Unlocked");

public static final Mode LOCKED = type.createAndRegister("Locked");

public static Mode valueOfStrict(String constant) {
return type.valueOfStrict(constant);
}

public static Mode valueOf(String constant) {
return type.valueOf(constant);
}

public static Mode[] values() {
return type.values();
}
}
}

/** Builder for {@code BlobInfo}. */
public abstract static class Builder {

Expand DownExpand Up@@ -408,6 +525,8 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return setRetentionExpirationTime(millisOffsetDateTimeCodec.decode(retentionExpirationTime));
}

public abstract Builder setRetention(Retention retention);

/** Creates a {@code BlobInfo} object. */
public abstract BlobInfo build();

Expand DownExpand Up@@ -506,6 +625,7 @@ static final class BuilderImpl extends Builder {
private Boolean eventBasedHold;
private Boolean temporaryHold;
private OffsetDateTime retentionExpirationTime;
private Retention retention;
private final ImmutableSet.Builder<NamedField> modifiedFields = ImmutableSet.builder();

BuilderImpl(BlobId blobId) {
Expand DownExpand Up@@ -543,6 +663,7 @@ static final class BuilderImpl extends Builder {
eventBasedHold = blobInfo.eventBasedHold;
temporaryHold = blobInfo.temporaryHold;
retentionExpirationTime = blobInfo.retentionExpirationTime;
retention = blobInfo.retention;
}

@Override
Expand DownExpand Up@@ -916,6 +1037,14 @@ Builder setRetentionExpirationTimeOffsetDateTime(OffsetDateTime retentionExpirat
return this;
}

@Override
public Builder setRetention(Retention retention) {
// todo: b/308194853
modifiedFields.add(BlobField.RETENTION);
this.retention = retention;
return this;
}

@Override
public BlobInfo build() {
checkNotNull(blobId);
Expand DownExpand Up@@ -1139,6 +1268,7 @@ Builder clearRetentionExpirationTime() {
eventBasedHold = builder.eventBasedHold;
temporaryHold = builder.temporaryHold;
retentionExpirationTime = builder.retentionExpirationTime;
retention = builder.retention;
modifiedFields = builder.modifiedFields.build();
}

Expand DownExpand Up@@ -1532,6 +1662,11 @@ public OffsetDateTime getRetentionExpirationTimeOffsetDateTime() {
return retentionExpirationTime;
}

/** Returns the object's Retention policy. */
public Retention getRetention() {
return retention;
}

/** Returns a builder for the current blob. */
public Builder toBuilder() {
return new BuilderImpl(this);
Expand DownExpand Up@@ -1581,6 +1716,7 @@ public int hashCode() {
kmsKeyName,
eventBasedHold,
temporaryHold,
retention,
retentionExpirationTime);
}

Expand DownExpand Up@@ -1622,7 +1758,8 @@ public boolean equals(Object o) {
&& Objects.equals(kmsKeyName, blobInfo.kmsKeyName)
&& Objects.equals(eventBasedHold, blobInfo.eventBasedHold)
&& Objects.equals(temporaryHold, blobInfo.temporaryHold)
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime);
&& Objects.equals(retentionExpirationTime, blobInfo.retentionExpirationTime)
&& Objects.equals(retention, blobInfo.retention);
}

ImmutableSet<NamedField> getModifiedFields() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -272,6 +272,16 @@ public static BlobTargetOption userProject(@NonNull String userProject) {
return new BlobTargetOption(UnifiedOpts.userProject(userProject));
}

/**
* Returns an option for overriding an Unlocked Retention policy. This must be set to true in
* order to change a policy from Unlocked to Locked, to set it to null, or to reduce its
* retainUntilTime attribute.
*/
@TransportCompatibility({Transport.HTTP})
public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlockedRetention) {
return new BlobTargetOption(UnifiedOpts.overrideUnlockedRetention(overrideUnlockedRetention));
}

/**
* Deduplicate any options which are the same parameter. The value which comes last in {@code
* os} will be the value included in the return.
Expand DownExpand Up@@ -732,6 +742,12 @@ public Builder setCustomPlacementConfig(CustomPlacementConfig customPlacementCon
return this;
}

@Override
Builder setObjectRetention(ObjectRetention objectRetention) {
infoBuilder.setObjectRetention(objectRetention);
return this;
}

@Override
public Bucket build() {
return new Bucket(storage, infoBuilder);
Expand Down
Loading