Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
2 changes: 1 addition & 1 deletion .github/workflows/hermetic_library_generation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
- uses: googleapis/sdk-platform-java/.github/scripts@v2.60.0
- uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0
if: env.SHOULD_RUN == 'true'
with:
base_ref: ${{ github.base_ref }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.62.0</version>
<version>26.63.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -46,12 +46,12 @@ If you are using Maven without the BOM, add this to your dependencies:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.53.1</version>
<version>2.53.2</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage-control</artifactId>
<version>2.53.1</version>
<version>2.53.2</version>
</dependency>

```
Expand Down
2 changes: 1 addition & 1 deletion generation_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gapic_generator_version: 2.59.0
googleapis_commitish: d57057715ebe652819419146472b09c14729d054
googleapis_commitish: cd7fed30706c129f2bca11d5b2ef18f4ad18a7ac
libraries_bom_version: 26.61.0
libraries:
- api_shortname: storage
Expand Down
31 changes: 31 additions & 0 deletions proto-google-cloud-storage-v2/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,37 @@
<className>com/google/storage/v2/*OrBuilder</className>
<method>boolean has*(*)</method>
</difference>
<!-- allow message fields to be removed -->
<!--
these messages are used by the google-cloud-storage module and would break compilation,
if there is an actual break.
-->
<difference>
<differenceType>6011</differenceType>
<className>com/google/storage/v2/**</className>
<field>*_FIELD_NUMBER</field>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/**</className>
<method>* clear*(*)</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/**</className>
<method>* get*(*)</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/**</className>
<method>* has*(*)</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/**</className>
<method>* set*(*)</method>
</difference>

<!-- The following 7006 exemptions are related to Protobuf 4.27.4 upgrade -->
<difference>
<differenceType>7006</differenceType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ public long getGeneration() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration matches the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_match = 4;</code>
Expand All @@ -222,6 +225,9 @@ public boolean hasIfMetagenerationMatch() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration matches the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_match = 4;</code>
Expand All @@ -242,6 +248,9 @@ public long getIfMetagenerationMatch() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration does not match the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_not_match = 5;</code>
Expand All @@ -259,6 +268,9 @@ public boolean hasIfMetagenerationNotMatch() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration does not match the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_not_match = 5;</code>
Expand Down Expand Up @@ -351,6 +363,9 @@ public com.google.protobuf.ByteString getRoutingTokenBytes() {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -368,6 +383,9 @@ public boolean hasWriteHandle() {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -387,6 +405,9 @@ public com.google.storage.v2.BidiWriteHandle getWriteHandle() {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand Down Expand Up @@ -1211,6 +1232,9 @@ public Builder clearGeneration() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration matches the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_match = 4;</code>
Expand All @@ -1228,6 +1252,9 @@ public boolean hasIfMetagenerationMatch() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration matches the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_match = 4;</code>
Expand All @@ -1245,6 +1272,9 @@ public long getIfMetagenerationMatch() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration matches the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_match = 4;</code>
Expand All @@ -1266,6 +1296,9 @@ public Builder setIfMetagenerationMatch(long value) {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration matches the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_match = 4;</code>
Expand All @@ -1287,6 +1320,9 @@ public Builder clearIfMetagenerationMatch() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration does not match the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_not_match = 5;</code>
Expand All @@ -1304,6 +1340,9 @@ public boolean hasIfMetagenerationNotMatch() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration does not match the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_not_match = 5;</code>
Expand All @@ -1321,6 +1360,9 @@ public long getIfMetagenerationNotMatch() {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration does not match the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_not_match = 5;</code>
Expand All @@ -1342,6 +1384,9 @@ public Builder setIfMetagenerationNotMatch(long value) {
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration does not match the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_not_match = 5;</code>
Expand Down Expand Up @@ -1500,6 +1545,9 @@ public Builder setRoutingTokenBytes(com.google.protobuf.ByteString value) {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -1516,6 +1564,9 @@ public boolean hasWriteHandle() {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -1538,6 +1589,9 @@ public com.google.storage.v2.BidiWriteHandle getWriteHandle() {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -1562,6 +1616,9 @@ public Builder setWriteHandle(com.google.storage.v2.BidiWriteHandle value) {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -1583,6 +1640,9 @@ public Builder setWriteHandle(com.google.storage.v2.BidiWriteHandle.Builder buil
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand Down Expand Up @@ -1612,6 +1672,9 @@ public Builder mergeWriteHandle(com.google.storage.v2.BidiWriteHandle value) {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -1633,6 +1696,9 @@ public Builder clearWriteHandle() {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -1649,6 +1715,9 @@ public com.google.storage.v2.BidiWriteHandle.Builder getWriteHandleBuilder() {
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -1669,6 +1738,9 @@ public com.google.storage.v2.BidiWriteHandleOrBuilder getWriteHandleOrBuilder()
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ public interface AppendObjectSpecOrBuilder
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration matches the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_match = 4;</code>
Expand All @@ -113,6 +116,9 @@ public interface AppendObjectSpecOrBuilder
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration matches the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_match = 4;</code>
Expand All @@ -127,6 +133,9 @@ public interface AppendObjectSpecOrBuilder
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration does not match the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_not_match = 5;</code>
Expand All @@ -141,6 +150,9 @@ public interface AppendObjectSpecOrBuilder
* <pre>
* Makes the operation conditional on whether the object's current
* metageneration does not match the given value.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional int64 if_metageneration_not_match = 5;</code>
Expand Down Expand Up @@ -197,6 +209,9 @@ public interface AppendObjectSpecOrBuilder
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -211,6 +226,9 @@ public interface AppendObjectSpecOrBuilder
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand All @@ -225,6 +243,9 @@ public interface AppendObjectSpecOrBuilder
* <pre>
* An optional write handle returned from a previous BidiWriteObjectResponse
* message or a BidiWriteObjectRedirectedError error.
*
* Note that metageneration preconditions are only checked if `write_handle`
* is empty.
* </pre>
*
* <code>optional .google.storage.v2.BidiWriteHandle write_handle = 7;</code>
Expand Down
Loading