Address a few more Error Prone warnings.

cpovirk · Google Java Core Libraries · commit 56ee117de0de · 2026-02-02T11:58:40.000-08:00
RELNOTES=n/a
PiperOrigin-RevId: 864459246
diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapTestSuiteBuilder.java b/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapTestSuiteBuilder.java
@@ -439,7 +439,7 @@ private static final class ValuesGenerator<K, V, M extends Multimap<K, V>>
       implements TestCollectionGenerator<V> {
     private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;
 
-    public ValuesGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
+    ValuesGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
       this.multimapGenerator = multimapGenerator;
     }
 
@@ -493,7 +493,7 @@ private static final class KeysGenerator<K, V, M extends Multimap<K, V>>
       implements TestMultisetGenerator<K>, DerivedGenerator {
     private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;
 
-    public KeysGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
+    KeysGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
       this.multimapGenerator = multimapGenerator;
     }
 
diff --git a/android/guava/src/com/google/common/base/Defaults.java b/android/guava/src/com/google/common/base/Defaults.java
@@ -39,7 +39,10 @@ private Defaults() {}
    * false} for {@code boolean} and {@code '\0'} for {@code char}. For non-primitive types and
    * {@code void}, {@code null} is returned.
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({
+    "unchecked",
+    "BooleanLiteral" // `(T) false` would produce an error
+  })
   public static <T> @Nullable T defaultValue(Class<T> type) {
     checkNotNull(type);
     if (type.isPrimitive()) {
diff --git a/android/guava/src/com/google/common/cache/CacheBuilderSpec.java b/android/guava/src/com/google/common/cache/CacheBuilderSpec.java
@@ -377,7 +377,7 @@ protected void parseInteger(CacheBuilderSpec spec, int value) {
   private static final class KeyStrengthParser implements ValueParser {
     private final Strength strength;
 
-    public KeyStrengthParser(Strength strength) {
+    KeyStrengthParser(Strength strength) {
       this.strength = strength;
     }
 
@@ -393,7 +393,7 @@ public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {
   private static final class ValueStrengthParser implements ValueParser {
     private final Strength strength;
 
-    public ValueStrengthParser(Strength strength) {
+    ValueStrengthParser(Strength strength) {
       this.strength = strength;
     }
 
diff --git a/android/guava/src/com/google/common/collect/ImmutableMap.java b/android/guava/src/com/google/common/collect/ImmutableMap.java
@@ -954,9 +954,8 @@ public ImmutableSet<K> keySet() {
   }
 
   /*
-   * This could have a good default implementation of return new ImmutableKeySet<K, V>(this),
-   * but ProGuard can't figure out how to eliminate that default when RegularImmutableMap
-   * overrides it.
+   * This could have a good default implementation of `return new ImmutableKeySet<K, V>(this)`, but
+   * ProGuard can't figure out how to eliminate that default when RegularImmutableMap overrides it.
    */
   abstract ImmutableSet<K> createKeySet();
 
@@ -988,9 +987,9 @@ public ImmutableCollection<V> values() {
   }
 
   /*
-   * This could have a good default implementation of {@code return new
-   * ImmutableMapValues<K, V>(this)}, but ProGuard can't figure out how to eliminate that default
-   * when RegularImmutableMap overrides it.
+   * This could have a good default implementation of `return new ImmutableMapValues<K, V>(this)`,
+   * but ProGuard can't figure out how to eliminate that default when RegularImmutableMap overrides
+   * it.
    */
   abstract ImmutableCollection<V> createValues();
 
diff --git a/android/guava/src/com/google/common/collect/Maps.java b/android/guava/src/com/google/common/collect/Maps.java
@@ -2095,7 +2095,7 @@ private static class TransformedEntriesSortedMap<
           K extends @Nullable Object, V1 extends @Nullable Object, V2 extends @Nullable Object>
       extends TransformedEntriesMap<K, V1, V2> implements SortedMap<K, V2> {
 
-    protected SortedMap<K, V1> fromMap() {
+    SortedMap<K, V1> fromMap() {
       return (SortedMap<K, V1>) fromMap;
     }
 
@@ -2262,7 +2262,7 @@ public NavigableMap<K, V2> tailMap(@ParametricNullness K fromKey, boolean inclus
     }
 
     @Override
-    protected NavigableMap<K, V1> fromMap() {
+    NavigableMap<K, V1> fromMap() {
       return (NavigableMap<K, V1>) super.fromMap();
     }
   }
diff --git a/guava-testlib/src/com/google/common/collect/testing/google/MultimapTestSuiteBuilder.java b/guava-testlib/src/com/google/common/collect/testing/google/MultimapTestSuiteBuilder.java
@@ -440,7 +440,7 @@ private static final class ValuesGenerator<K, V, M extends Multimap<K, V>>
       implements TestCollectionGenerator<V> {
     private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;
 
-    public ValuesGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
+    ValuesGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
       this.multimapGenerator = multimapGenerator;
     }
 
@@ -494,7 +494,7 @@ private static final class KeysGenerator<K, V, M extends Multimap<K, V>>
       implements TestMultisetGenerator<K>, DerivedGenerator {
     private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;
 
-    public KeysGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
+    KeysGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
       this.multimapGenerator = multimapGenerator;
     }
 
diff --git a/guava/src/com/google/common/base/Defaults.java b/guava/src/com/google/common/base/Defaults.java
@@ -39,7 +39,10 @@ private Defaults() {}
    * false} for {@code boolean} and {@code '\0'} for {@code char}. For non-primitive types and
    * {@code void}, {@code null} is returned.
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({
+    "unchecked",
+    "BooleanLiteral" // `(T) false` would produce an error
+  })
   public static <T> @Nullable T defaultValue(Class<T> type) {
     checkNotNull(type);
     if (type.isPrimitive()) {
diff --git a/guava/src/com/google/common/cache/CacheBuilderSpec.java b/guava/src/com/google/common/cache/CacheBuilderSpec.java
@@ -377,7 +377,7 @@ protected void parseInteger(CacheBuilderSpec spec, int value) {
   private static final class KeyStrengthParser implements ValueParser {
     private final Strength strength;
 
-    public KeyStrengthParser(Strength strength) {
+    KeyStrengthParser(Strength strength) {
       this.strength = strength;
     }
 
@@ -393,7 +393,7 @@ public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {
   private static final class ValueStrengthParser implements ValueParser {
     private final Strength strength;
 
-    public ValueStrengthParser(Strength strength) {
+    ValueStrengthParser(Strength strength) {
       this.strength = strength;
     }
 
diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java
@@ -1067,9 +1067,8 @@ public ImmutableSet<K> keySet() {
   }
 
   /*
-   * This could have a good default implementation of return new ImmutableKeySet<K, V>(this),
-   * but ProGuard can't figure out how to eliminate that default when RegularImmutableMap
-   * overrides it.
+   * This could have a good default implementation of `return new ImmutableKeySet<K, V>(this)`, but
+   * ProGuard can't figure out how to eliminate that default when RegularImmutableMap overrides it.
    */
   abstract ImmutableSet<K> createKeySet();
 
@@ -1109,9 +1108,9 @@ public ImmutableCollection<V> values() {
   }
 
   /*
-   * This could have a good default implementation of {@code return new
-   * ImmutableMapValues<K, V>(this)}, but ProGuard can't figure out how to eliminate that default
-   * when RegularImmutableMap overrides it.
+   * This could have a good default implementation of `return new ImmutableMapValues<K, V>(this)`,
+   * but ProGuard can't figure out how to eliminate that default when RegularImmutableMap overrides
+   * it.
    */
   abstract ImmutableCollection<V> createValues();
 
diff --git a/guava/src/com/google/common/collect/Maps.java b/guava/src/com/google/common/collect/Maps.java
@@ -2203,7 +2203,7 @@ private static class TransformedEntriesSortedMap<
           K extends @Nullable Object, V1 extends @Nullable Object, V2 extends @Nullable Object>
       extends TransformedEntriesMap<K, V1, V2> implements SortedMap<K, V2> {
 
-    protected SortedMap<K, V1> fromMap() {
+    SortedMap<K, V1> fromMap() {
       return (SortedMap<K, V1>) fromMap;
     }
 
@@ -2370,7 +2370,7 @@ public NavigableMap<K, V2> tailMap(@ParametricNullness K fromKey, boolean inclus
     }
 
     @Override
-    protected NavigableMap<K, V1> fromMap() {
+    NavigableMap<K, V1> fromMap() {
       return (NavigableMap<K, V1>) super.fromMap();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ private static final class ValuesGenerator<K, V, M extends Multimap<K, V>>`
`439`	`439`	`implements TestCollectionGenerator<V> {`
`440`	`440`	`private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;`
`441`	`441`
`442`		`- public ValuesGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {`
	`442`	`+ ValuesGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {`
`443`	`443`	`this.multimapGenerator = multimapGenerator;`
`444`	`444`	`}`
`445`	`445`
`@@ -493,7 +493,7 @@ private static final class KeysGenerator<K, V, M extends Multimap<K, V>>`
`493`	`493`	`implements TestMultisetGenerator<K>, DerivedGenerator {`
`494`	`494`	`private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;`
`495`	`495`
`496`		`- public KeysGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {`
	`496`	`+ KeysGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {`
`497`	`497`	`this.multimapGenerator = multimapGenerator;`
`498`	`498`	`}`
`499`	`499`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ protected void parseInteger(CacheBuilderSpec spec, int value) {`
`377`	`377`	`private static final class KeyStrengthParser implements ValueParser {`
`378`	`378`	`private final Strength strength;`
`379`	`379`
`380`		`- public KeyStrengthParser(Strength strength) {`
	`380`	`+ KeyStrengthParser(Strength strength) {`
`381`	`381`	`this.strength = strength;`
`382`	`382`	`}`
`383`	`383`
`@@ -393,7 +393,7 @@ public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {`
`393`	`393`	`private static final class ValueStrengthParser implements ValueParser {`
`394`	`394`	`private final Strength strength;`
`395`	`395`
`396`		`- public ValueStrengthParser(Strength strength) {`
	`396`	`+ ValueStrengthParser(Strength strength) {`
`397`	`397`	`this.strength = strength;`
`398`	`398`	`}`
`399`	`399`
Original file line number	Diff line number	Diff line change
`@@ -2095,7 +2095,7 @@ private static class TransformedEntriesSortedMap<`
`2095`	`2095`	`K extends @Nullable Object, V1 extends @Nullable Object, V2 extends @Nullable Object>`
`2096`	`2096`	`extends TransformedEntriesMap<K, V1, V2> implements SortedMap<K, V2> {`
`2097`	`2097`
`2098`		`- protected SortedMap<K, V1> fromMap() {`
	`2098`	`+ SortedMap<K, V1> fromMap() {`
`2099`	`2099`	`return (SortedMap<K, V1>) fromMap;`
`2100`	`2100`	`}`
`2101`	`2101`
`@@ -2262,7 +2262,7 @@ public NavigableMap<K, V2> tailMap(@ParametricNullness K fromKey, boolean inclus`
`2262`	`2262`	`}`
`2263`	`2263`
`2264`	`2264`	`@Override`
`2265`		`- protected NavigableMap<K, V1> fromMap() {`
	`2265`	`+ NavigableMap<K, V1> fromMap() {`
`2266`	`2266`	`return (NavigableMap<K, V1>) super.fromMap();`
`2267`	`2267`	`}`
`2268`	`2268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ private static final class ValuesGenerator<K, V, M extends Multimap<K, V>>`
`440`	`440`	`implements TestCollectionGenerator<V> {`
`441`	`441`	`private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;`
`442`	`442`
`443`		`- public ValuesGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {`
	`443`	`+ ValuesGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {`
`444`	`444`	`this.multimapGenerator = multimapGenerator;`
`445`	`445`	`}`
`446`	`446`
`@@ -494,7 +494,7 @@ private static final class KeysGenerator<K, V, M extends Multimap<K, V>>`
`494`	`494`	`implements TestMultisetGenerator<K>, DerivedGenerator {`
`495`	`495`	`private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;`
`496`	`496`
`497`		`- public KeysGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {`
	`497`	`+ KeysGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {`
`498`	`498`	`this.multimapGenerator = multimapGenerator;`
`499`	`499`	`}`
`500`	`500`
Original file line number	Diff line number	Diff line change
`@@ -2203,7 +2203,7 @@ private static class TransformedEntriesSortedMap<`
`2203`	`2203`	`K extends @Nullable Object, V1 extends @Nullable Object, V2 extends @Nullable Object>`
`2204`	`2204`	`extends TransformedEntriesMap<K, V1, V2> implements SortedMap<K, V2> {`
`2205`	`2205`
`2206`		`- protected SortedMap<K, V1> fromMap() {`
	`2206`	`+ SortedMap<K, V1> fromMap() {`
`2207`	`2207`	`return (SortedMap<K, V1>) fromMap;`
`2208`	`2208`	`}`
`2209`	`2209`
`@@ -2370,7 +2370,7 @@ public NavigableMap<K, V2> tailMap(@ParametricNullness K fromKey, boolean inclus`
`2370`	`2370`	`}`
`2371`	`2371`
`2372`	`2372`	`@Override`
`2373`		`- protected NavigableMap<K, V1> fromMap() {`
	`2373`	`+ NavigableMap<K, V1> fromMap() {`
`2374`	`2374`	`return (NavigableMap<K, V1>) super.fromMap();`
`2375`	`2375`	`}`
`2376`	`2376`	`}`