Skip to content

Commit

Permalink
chore: update clirr config to allow removal of REGAPIC
Browse files Browse the repository at this point in the history
  • Loading branch information
BenWhitehead committed Nov 8, 2022
1 parent 68b2793 commit 55fc637
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 104 deletions.
21 changes: 21 additions & 0 deletions gapic-google-cloud-storage-v2/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<!-- Remove REGAPIC client which GCS does not support -->
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/StorageSettings</className>
<method>* *HttpJson*Builder()</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/stub/StorageStubSettings</className>
<method>* *HttpJson*Builder()</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/stub/StorageStubSettings</className>
<method>* defaultGrpcApiClientHeaderProviderBuilder()</method>
</difference>

</differences>
67 changes: 0 additions & 67 deletions google-cloud-storage/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
@@ -1,72 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see https://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<className>com/google/cloud/storage/BucketInfo*</className>
<differenceType>7013</differenceType>
<method>* setCustomPlacementConfig(com.google.cloud.storage.BucketInfo$CustomPlacementConfig)</method>
</difference>

<difference>
<className>com/google/cloud/storage/BucketInfo*</className>
<differenceType>7013</differenceType>
<method>* setAutoclass(com.google.cloud.storage.BucketInfo$Autoclass)</method>
</difference>

<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/storage/HmacKey$HmacKeyMetadata</className>
<method>* toPb()</method>
</difference>

<!--
Allow StorageOptions and StorageOptions$Builder to now be abstract. This
shows as a binary breaking change, however both classes had private
constructors, so no one was able to extend them previously.
-->
<difference>
<differenceType>3005</differenceType>
<className>com/google/cloud/storage/StorageOptions</className>
</difference>
<difference>
<differenceType>3005</differenceType>
<className>com/google/cloud/storage/StorageOptions$Builder</className>
</difference>

<!--
The following methods have been moved to HttpStorageOptions as they are only applicable there
-->
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/storage/StorageOptions</className>
<method>* getStorageRpcV1()</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/storage/StorageOptions$Builder</className>
<method>* setTransportOptions(*)</method>
</difference>

<!--
Allow com.google.cloud.storage.Storage to extends AutoClosable
// Storage defines a default implementation in the interface, but clirr
// is ignorant to java 8 constructs
-->
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/storage/Storage</className>
<method>void close()</method>
</difference>

<!--
Allow com.google.cloud.storage.CopyWriter to now be abstract.
Previously, the class was only extendable within the package due to
constructor scope, making it abstract will be compatible for our
customers.
-->
<difference>
<differenceType>3005</differenceType>
<className>com/google/cloud/storage/CopyWriter</className>
</difference>

</differences>
37 changes: 0 additions & 37 deletions proto-google-cloud-storage-v2/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
@@ -1,42 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<!-- CancelResumableWrite RPC has been introduced, cleanup old upload_id parameters from DeleteObjectRequest -->
<difference>
<differenceType>6011</differenceType>
<className>com/google/storage/v2/DeleteObjectRequest</className>
<field>UPLOAD_ID_FIELD_NUMBER</field>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/**</className>
<method>* *UploadId*(*)</method>
</difference>

<!-- Allow WriteObjectSpec.object_size to be added -->
<difference>
<differenceType>7012</differenceType>
<className>com/google/storage/v2/WriteObjectSpecOrBuilder</className>
<method>* *ObjectSize()</method>
</difference>

<!-- Allow adding new entity_alt field to Acls -->
<difference>
<differenceType>7012</differenceType>
<className>com/google/storage/v2/BucketAccessControlOrBuilder</className>
<method>* *EntityAlt*()</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/storage/v2/ObjectAccessControlOrBuilder</className>
<method>* *EntityAlt*()</method>
</difference>

<!-- Allow Bucket.RetentionPolicy.retention_period to be optional -->
<difference>
<differenceType>7012</differenceType>
<className>com/google/storage/v2/Bucket$RetentionPolicyOrBuilder</className>
<method>boolean hasRetentionPeriod()</method>
</difference>

</differences>

0 comments on commit 55fc637

Please sign in to comment.