Skip to content

Commit 9a6c8a6

Browse files
Upgrade Guava 33.4.8-jre -> 33.5.0-jre (#1869)
And drop some Refaster rules now covered by `@InlineMe` instructions. See: - https://guava.dev/releases/33.5.0-jre/api/diffs/ - https://github.com/google/guava/releases/tag/v33.5.0 - google/guava@v33.4.8...v33.5.0
1 parent 6d6cfeb commit 9a6c8a6

File tree

5 files changed

+2
-214
lines changed

5 files changed

+2
-214
lines changed

error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/PrimitiveRules.java

Lines changed: 0 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package tech.picnic.errorprone.refasterrules;
22

3-
import com.google.common.primitives.Booleans;
4-
import com.google.common.primitives.Bytes;
53
import com.google.common.primitives.Chars;
64
import com.google.common.primitives.Doubles;
75
import com.google.common.primitives.Floats;
@@ -95,110 +93,6 @@ int after(long l) {
9593
}
9694
}
9795

98-
/** Prefer {@link Boolean#hashCode(boolean)} over the Guava alternative. */
99-
static final class BooleanHashCode {
100-
@BeforeTemplate
101-
int before(boolean b) {
102-
return Booleans.hashCode(b);
103-
}
104-
105-
@AfterTemplate
106-
int after(boolean b) {
107-
return Boolean.hashCode(b);
108-
}
109-
}
110-
111-
/** Prefer {@link Byte#hashCode(byte)} over the Guava alternative. */
112-
static final class ByteHashCode {
113-
@BeforeTemplate
114-
int before(byte b) {
115-
return Bytes.hashCode(b);
116-
}
117-
118-
@AfterTemplate
119-
int after(byte b) {
120-
return Byte.hashCode(b);
121-
}
122-
}
123-
124-
/** Prefer {@link Character#hashCode(char)} over the Guava alternative. */
125-
static final class CharacterHashCode {
126-
@BeforeTemplate
127-
int before(char c) {
128-
return Chars.hashCode(c);
129-
}
130-
131-
@AfterTemplate
132-
int after(char c) {
133-
return Character.hashCode(c);
134-
}
135-
}
136-
137-
/** Prefer {@link Short#hashCode(short)} over the Guava alternative. */
138-
static final class ShortHashCode {
139-
@BeforeTemplate
140-
int before(short s) {
141-
return Shorts.hashCode(s);
142-
}
143-
144-
@AfterTemplate
145-
int after(short s) {
146-
return Short.hashCode(s);
147-
}
148-
}
149-
150-
/** Prefer {@link Integer#hashCode(int)} over the Guava alternative. */
151-
static final class IntegerHashCode {
152-
@BeforeTemplate
153-
int before(int i) {
154-
return Ints.hashCode(i);
155-
}
156-
157-
@AfterTemplate
158-
int after(int i) {
159-
return Integer.hashCode(i);
160-
}
161-
}
162-
163-
/** Prefer {@link Long#hashCode(long)} over the Guava alternative. */
164-
static final class LongHashCode {
165-
@BeforeTemplate
166-
int before(long l) {
167-
return Longs.hashCode(l);
168-
}
169-
170-
@AfterTemplate
171-
int after(long l) {
172-
return Long.hashCode(l);
173-
}
174-
}
175-
176-
/** Prefer {@link Float#hashCode(float)} over the Guava alternative. */
177-
static final class FloatHashCode {
178-
@BeforeTemplate
179-
int before(float f) {
180-
return Floats.hashCode(f);
181-
}
182-
183-
@AfterTemplate
184-
int after(float f) {
185-
return Float.hashCode(f);
186-
}
187-
}
188-
189-
/** Prefer {@link Double#hashCode(double)} over the Guava alternative. */
190-
static final class DoubleHashCode {
191-
@BeforeTemplate
192-
int before(double d) {
193-
return Doubles.hashCode(d);
194-
}
195-
196-
@AfterTemplate
197-
int after(double d) {
198-
return Double.hashCode(d);
199-
}
200-
}
201-
20296
/** Prefer {@link Character#BYTES} over the Guava alternative. */
20397
static final class CharacterBytes {
20498
@BeforeTemplate
@@ -277,32 +171,6 @@ int after() {
277171
}
278172
}
279173

280-
/** Prefer {@link Float#isFinite(float)} over the Guava alternative. */
281-
static final class FloatIsFinite {
282-
@BeforeTemplate
283-
boolean before(float f) {
284-
return Floats.isFinite(f);
285-
}
286-
287-
@AfterTemplate
288-
boolean after(float f) {
289-
return Float.isFinite(f);
290-
}
291-
}
292-
293-
/** Prefer {@link Double#isFinite(double)} over the Guava alternative. */
294-
static final class DoubleIsFinite {
295-
@BeforeTemplate
296-
boolean before(double d) {
297-
return Doubles.isFinite(d);
298-
}
299-
300-
@AfterTemplate
301-
boolean after(double d) {
302-
return Double.isFinite(d);
303-
}
304-
}
305-
306174
/** Prefer an {@link Integer#signum(int)} comparison to 1 over less clear alternatives. */
307175
static final class IntegerSignumIsPositive {
308176
@BeforeTemplate

error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/PrimitiveRulesTestInput.java

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -80,38 +80,6 @@ int testLongToIntExact() {
8080
return Ints.checkedCast(Long.MAX_VALUE);
8181
}
8282

83-
int testBooleanHashCode() {
84-
return Booleans.hashCode(true);
85-
}
86-
87-
int testByteHashCode() {
88-
return Bytes.hashCode((byte) 1);
89-
}
90-
91-
int testCharacterHashCode() {
92-
return Chars.hashCode('a');
93-
}
94-
95-
int testShortHashCode() {
96-
return Shorts.hashCode((short) 1);
97-
}
98-
99-
int testIntegerHashCode() {
100-
return Ints.hashCode(1);
101-
}
102-
103-
int testLongHashCode() {
104-
return Longs.hashCode(1);
105-
}
106-
107-
int testFloatHashCode() {
108-
return Floats.hashCode(1);
109-
}
110-
111-
int testDoubleHashCode() {
112-
return Doubles.hashCode(1);
113-
}
114-
11583
int testCharacterBytes() {
11684
return Chars.BYTES;
11785
}
@@ -136,14 +104,6 @@ int testDoubleBytes() {
136104
return Doubles.BYTES;
137105
}
138106

139-
boolean testFloatIsFinite() {
140-
return Floats.isFinite(1);
141-
}
142-
143-
boolean testDoubleIsFinite() {
144-
return Doubles.isFinite(1);
145-
}
146-
147107
ImmutableSet<Boolean> testIntegerSignumIsPositive() {
148108
return ImmutableSet.of(
149109
Integer.signum(1) > 0,

error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/PrimitiveRulesTestOutput.java

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -81,38 +81,6 @@ int testLongToIntExact() {
8181
return Math.toIntExact(Long.MAX_VALUE);
8282
}
8383

84-
int testBooleanHashCode() {
85-
return Boolean.hashCode(true);
86-
}
87-
88-
int testByteHashCode() {
89-
return Byte.hashCode((byte) 1);
90-
}
91-
92-
int testCharacterHashCode() {
93-
return Character.hashCode('a');
94-
}
95-
96-
int testShortHashCode() {
97-
return Short.hashCode((short) 1);
98-
}
99-
100-
int testIntegerHashCode() {
101-
return Integer.hashCode(1);
102-
}
103-
104-
int testLongHashCode() {
105-
return Long.hashCode(1);
106-
}
107-
108-
int testFloatHashCode() {
109-
return Float.hashCode(1);
110-
}
111-
112-
int testDoubleHashCode() {
113-
return Double.hashCode(1);
114-
}
115-
11684
int testCharacterBytes() {
11785
return Character.BYTES;
11886
}
@@ -137,14 +105,6 @@ int testDoubleBytes() {
137105
return Double.BYTES;
138106
}
139107

140-
boolean testFloatIsFinite() {
141-
return Float.isFinite(1);
142-
}
143-
144-
boolean testDoubleIsFinite() {
145-
return Double.isFinite(1);
146-
}
147-
148108
ImmutableSet<Boolean> testIntegerSignumIsPositive() {
149109
return ImmutableSet.of(
150110
Integer.signum(1) == 1,

integration-tests/metrics-init.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
+ <dependency>
3939
+ <groupId>com.google.guava</groupId>
4040
+ <artifactId>guava</artifactId>
41-
+ <version>33.4.8-jre<!-- Renovate: com.google.guava:guava-bom --></version>
41+
+ <version>33.5.0-jre<!-- Renovate: com.google.guava:guava-bom --></version>
4242
+ </dependency>
4343
+ </dependencies>
4444
+ </dependencyManagement>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
<dependency>
347347
<groupId>com.google.guava</groupId>
348348
<artifactId>guava-bom</artifactId>
349-
<version>33.4.8-jre</version>
349+
<version>33.5.0-jre</version>
350350
<type>pom</type>
351351
<scope>import</scope>
352352
</dependency>

0 commit comments

Comments
 (0)