Skip to content

Commit 0122757

Browse files
hannahrogers-googlehannahrogers-google
authored
fix: add clirr ignored diffs files (#184)
* fix: keep track of internal seek * fix: check shutdown on seek * fix: reset tokens on seek * feat: add api client header to outbound requests * fix format * feat: adding ignored diffs for clirr * revert stub changes * chore: add clirr checks back
1 parent 7eb7861 commit 0122757

File tree

7 files changed

+162
-45
lines changed

7 files changed

+162
-45
lines changed

‎google-cloud-pubsublite/clirr-ignored-differences.xml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<!-- TODO: remove after next version release -->
6+
<differenceType>6001</differenceType>
7+
<className>com/google/cloud/pubsublite/AdminClientSettings</className>
8+
<field>DEFAULT_RETRY_SETTINGS</field>
9+
</difference>
10+
<difference>
11+
<differenceType>6000</differenceType>
12+
<className>com/google/cloud/pubsublite/internal/*</className>
13+
<method>*</method>
14+
</difference>
15+
<difference>
16+
<differenceType>6001</differenceType>
17+
<className>com/google/cloud/pubsublite/internal/*</className>
18+
<method>*</method>
19+
</difference>
20+
<difference>
21+
<differenceType>7001</differenceType>
22+
<className>com/google/cloud/pubsublite/internal/*</className>
23+
<method>*</method>
24+
</difference>
25+
<difference>
26+
<differenceType>7002</differenceType>
27+
<className>com/google/cloud/pubsublite/internal/*</className>
28+
<method>*</method>
29+
</difference>
30+
<difference>
31+
<differenceType>7011</differenceType>
32+
<className>com/google/cloud/pubsublite/internal/*</className>
33+
<method>*</method>
34+
</difference>
35+
<difference>
36+
<differenceType>7012</differenceType>
37+
<className>com/google/cloud/pubsublite/internal/*</className>
38+
<method>*</method>
39+
</difference>
40+
<difference>
41+
<differenceType>7013</differenceType>
42+
<className>com/google/cloud/pubsublite/internal/*</className>
43+
<method>*</method>
44+
</difference>
45+
<difference>
46+
<differenceType>8000</differenceType>
47+
<className>com/google/cloud/pubsublite/internal/*</className>
48+
</difference>
49+
<difference>
50+
<differenceType>8001</differenceType>
51+
<className>com/google/cloud/pubsublite/internal/*</className>
52+
</difference>
53+
<difference>
54+
<differenceType>6000</differenceType>
55+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
56+
<method>*</method>
57+
</difference>
58+
<difference>
59+
<differenceType>6001</differenceType>
60+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
61+
<method>*</method>
62+
</difference>
63+
<difference>
64+
<differenceType>7001</differenceType>
65+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
66+
<method>*</method>
67+
</difference>
68+
<difference>
69+
<differenceType>7002</differenceType>
70+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
71+
<method>*</method>
72+
</difference>
73+
<difference>
74+
<differenceType>7011</differenceType>
75+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
76+
<method>*</method>
77+
</difference>
78+
<difference>
79+
<differenceType>7012</differenceType>
80+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
81+
<method>*</method>
82+
</difference>
83+
<difference>
84+
<differenceType>7013</differenceType>
85+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
86+
<method>*</method>
87+
</difference>
88+
<difference>
89+
<differenceType>8000</differenceType>
90+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
91+
</difference>
92+
<difference>
93+
<differenceType>8001</differenceType>
94+
<className>com/google/cloud/pubsublite/cloudpubsub/internal/*</className>
95+
</difference>
96+
</differences>

‎google-cloud-pubsublite/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,21 +215,6 @@
215215
<groupId>org.codehaus.mojo</groupId>
216216
<artifactId>flatten-maven-plugin</artifactId>
217217
</plugin>
218-
<plugin>
219-
<!--TODO: Remove before GA. -->
220-
<groupId>org.codehaus.mojo</groupId>
221-
<artifactId>clirr-maven-plugin</artifactId>
222-
<configuration>
223-
<failOnError>false</failOnError>
224-
</configuration>
225-
<executions>
226-
<execution>
227-
<goals>
228-
<goal>check</goal>
229-
</goals>
230-
</execution>
231-
</executions>
232-
</plugin>
233218
</plugins>
234219
</build>
235220
</project>

‎google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/Stubs.java‎

100755100644
File mode changed.

‎proto-google-cloud-pubsublite-v1/clirr-ignored-differences.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<differenceType>7012</differenceType>
6+
<className>com/google/cloud/pubsublite/proto/*OrBuilder</className>
7+
<method>* get*(*)</method>
8+
</difference>
9+
<difference>
10+
<differenceType>7012</differenceType>
11+
<className>com/google/cloud/pubsublite/proto/*OrBuilder</className>
12+
<method>boolean contains*(*)</method>
13+
</difference>
14+
<difference>
15+
<differenceType>7012</differenceType>
16+
<className>com/google/cloud/pubsublite/proto/*OrBuilder</className>
17+
<method>boolean has*(*)</method>
18+
</difference>
19+
</differences>

‎proto-google-cloud-pubsublite-v1/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@
4141
<groupId>org.codehaus.mojo</groupId>
4242
<artifactId>flatten-maven-plugin</artifactId>
4343
</plugin>
44-
<plugin>
45-
<!--TODO: Remove before GA. -->
46-
<groupId>org.codehaus.mojo</groupId>
47-
<artifactId>clirr-maven-plugin</artifactId>
48-
<configuration>
49-
<failOnError>false</failOnError>
50-
</configuration>
51-
<executions>
52-
<execution>
53-
<goals>
54-
<goal>check</goal>
55-
</goals>
56-
</execution>
57-
</executions>
58-
</plugin>
5944
</plugins>
6045
</build>
6146
</project>

‎pubsublite-beam-io/clirr-ignored-differences.xml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<differenceType>6000</differenceType>
6+
<className>com/google/cloud/pubsublite/beam/*</className>
7+
<method>*</method>
8+
</difference>
9+
<difference>
10+
<differenceType>6001</differenceType>
11+
<className>com/google/cloud/pubsublite/beam/*</className>
12+
<method>*</method>
13+
</difference>
14+
<difference>
15+
<differenceType>7001</differenceType>
16+
<className>com/google/cloud/pubsublite/beam/*</className>
17+
<method>*</method>
18+
</difference>
19+
<difference>
20+
<differenceType>7002</differenceType>
21+
<className>com/google/cloud/pubsublite/beam/*</className>
22+
<method>*</method>
23+
</difference>
24+
<difference>
25+
<differenceType>7011</differenceType>
26+
<className>com/google/cloud/pubsublite/beam/*</className>
27+
<method>*</method>
28+
</difference>
29+
<difference>
30+
<differenceType>7012</differenceType>
31+
<className>com/google/cloud/pubsublite/beam/*</className>
32+
<method>*</method>
33+
</difference>
34+
<difference>
35+
<differenceType>7013</differenceType>
36+
<className>com/google/cloud/pubsublite/beam/*</className>
37+
<method>*</method>
38+
</difference>
39+
<difference>
40+
<differenceType>8000</differenceType>
41+
<className>com/google/cloud/pubsublite/beam/*</className>
42+
</difference>
43+
<difference>
44+
<differenceType>8001</differenceType>
45+
<className>com/google/cloud/pubsublite/beam/*</className>
46+
</difference>
47+
</differences>

‎pubsublite-beam-io/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -175,21 +175,6 @@
175175
</execution>
176176
</executions>
177177
</plugin>
178-
<plugin>
179-
<!--TODO: Remove before GA. -->
180-
<groupId>org.codehaus.mojo</groupId>
181-
<artifactId>clirr-maven-plugin</artifactId>
182-
<configuration>
183-
<failOnError>false</failOnError>
184-
</configuration>
185-
<executions>
186-
<execution>
187-
<goals>
188-
<goal>check</goal>
189-
</goals>
190-
</execution>
191-
</executions>
192-
</plugin>
193178
</plugins>
194179
</build>
195180
</project>

0 commit comments

Comments
 (0)