Skip to content

chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime #4297

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
rahul2393 merged 1 commit into from
Jan 8, 2026
Merged

chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime #4297

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 57 additions & 1 deletion proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,63 @@
<method>boolean has*(*)</method>
</difference>

<!-- The following 7006 exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
<!-- The following exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
<!-- 5001: Removed GeneratedMessage/GeneratedMessage$Builder from superclass hierarchy -->
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*Proto</className>
<to>com/google/protobuf/GeneratedFile</to>
</difference>
Comment on lines +22 to +56
Copy link

@gemini-code-assist gemini-code-assist bot Jan 8, 2026

Choose a reason for hiding this comment

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

medium

The exemptions for difference type 5001 can be significantly simplified. The current patterns for different nesting levels of protobuf messages and builders are verbose and could be hard to maintain. Since the ** wildcard is already used for other difference types in this file, it can be used here to cover all classes within the package, including nested ones. This will make the configuration more concise and easier to manage across the different modules.

The same simplification can be applied to the other clirr-ignored-differences.xml files in this PR.

Suggested change
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*$*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*Proto</className>
<to>com/google/protobuf/GeneratedFile</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/**</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/**</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/database/v1/*Proto</className>
<to>com/google/protobuf/GeneratedFile</to>
</difference>

<!-- 7005: Parameter type changes (BuilderParent) -->
<difference>
<differenceType>7005</differenceType>
<className>com/google/spanner/admin/database/v1/**</className>
<method>* newBuilderForType(*)</method>
<to>**</to>
</difference>
<!-- 7006: Return type changes for internalGetFieldAccessorTable -->
<difference>
<differenceType>7006</differenceType>
<className>com/google/spanner/admin/database/v1/**</className>
<method>* internalGetFieldAccessorTable()</method>
<to>**</to>
</difference>
<!-- 7014: Method made final -->
<difference>
<differenceType>7014</differenceType>
<className>com/google/spanner/admin/database/v1/**</className>
<method>* getDescriptor()</method>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/spanner/admin/database/v1/**</className>
Expand Down
58 changes: 57 additions & 1 deletion proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,63 @@
<method>boolean has*(*)</method>
</difference>

<!-- The following 7006 exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
<!-- The following exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
<!-- 5001: Removed GeneratedMessage/GeneratedMessage$Builder from superclass hierarchy -->
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/instance/v1/*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/instance/v1/*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/instance/v1/*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/instance/v1/*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/instance/v1/*$*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/instance/v1/*$*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/admin/instance/v1/*Proto</className>
<to>com/google/protobuf/GeneratedFile</to>
</difference>
<!-- 7005: Parameter type changes (BuilderParent) -->
<difference>
<differenceType>7005</differenceType>
<className>com/google/spanner/admin/instance/v1/**</className>
<method>* newBuilderForType(*)</method>
<to>**</to>
</difference>
<!-- 7006: Return type changes for internalGetFieldAccessorTable -->
<difference>
<differenceType>7006</differenceType>
<className>com/google/spanner/admin/instance/v1/**</className>
<method>* internalGetFieldAccessorTable()</method>
<to>**</to>
</difference>
<!-- 7014: Method made final -->
<difference>
<differenceType>7014</differenceType>
<className>com/google/spanner/admin/instance/v1/**</className>
<method>* getDescriptor()</method>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/spanner/admin/instance/v1/**</className>
Expand Down
58 changes: 57 additions & 1 deletion proto-google-cloud-spanner-executor-v1/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,63 @@
<className>com/google/spanner/executor/v1/SpannerExecutorProxyGrpc$SpannerExecutorProxyStub</className>
</difference>

<!-- The following 7006 exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
<!-- The following exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
<!-- 5001: Removed GeneratedMessage/GeneratedMessage$Builder from superclass hierarchy -->
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/executor/v1/*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/executor/v1/*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/executor/v1/*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/executor/v1/*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/executor/v1/*$*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/executor/v1/*$*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/executor/v1/*Proto</className>
<to>com/google/protobuf/GeneratedFile</to>
</difference>
<!-- 7005: Parameter type changes (BuilderParent) -->
<difference>
<differenceType>7005</differenceType>
<className>com/google/spanner/executor/v1/**</className>
<method>* newBuilderForType(*)</method>
<to>**</to>
</difference>
<!-- 7006: Return type changes for internalGetFieldAccessorTable -->
<difference>
<differenceType>7006</differenceType>
<className>com/google/spanner/executor/v1/**</className>
<method>* internalGetFieldAccessorTable()</method>
<to>**</to>
</difference>
<!-- 7014: Method made final -->
<difference>
<differenceType>7014</differenceType>
<className>com/google/spanner/executor/v1/**</className>
<method>* getDescriptor()</method>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/spanner/executor/v1/**</className>
Expand Down
58 changes: 57 additions & 1 deletion proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,63 @@
<method>boolean has*(*)</method>
</difference>

<!-- The following 7006 exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
<!-- The following exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
<!-- 5001: Removed GeneratedMessage/GeneratedMessage$Builder from superclass hierarchy -->
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/v1/*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/v1/*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/v1/*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/v1/*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/v1/*$*$*</className>
<to>com/google/protobuf/GeneratedMessage</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/v1/*$*$*$Builder</className>
<to>com/google/protobuf/GeneratedMessage$Builder</to>
</difference>
<difference>
<differenceType>5001</differenceType>
<className>com/google/spanner/v1/*Proto</className>
<to>com/google/protobuf/GeneratedFile</to>
</difference>
<!-- 7005: Parameter type changes (BuilderParent) -->
<difference>
<differenceType>7005</differenceType>
<className>com/google/spanner/v1/**</className>
<method>* newBuilderForType(*)</method>
<to>**</to>
</difference>
<!-- 7006: Return type changes for internalGetFieldAccessorTable -->
<difference>
<differenceType>7006</differenceType>
<className>com/google/spanner/v1/**</className>
<method>* internalGetFieldAccessorTable()</method>
<to>**</to>
</difference>
<!-- 7014: Method made final -->
<difference>
<differenceType>7014</differenceType>
<className>com/google/spanner/v1/**</className>
<method>* getDescriptor()</method>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/spanner/v1/**</className>
Expand Down
Loading