Fix a few Javadoc warnings.

cpovirk · Google Java Core Libraries · commit 740d8bdaa6ce · 2025-02-13T13:32:17.000-08:00
They are the product of cl/726095812 and... cl/133039225 + cl/137220845 + cl/139396264, oops!

RELNOTES=n/a
PiperOrigin-RevId: 726615521
diff --git a/android/guava/src/com/google/common/collect/FluentIterable.java b/android/guava/src/com/google/common/collect/FluentIterable.java
@@ -31,6 +31,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.SortedSet;
+import java.util.stream.Stream;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
diff --git a/android/guava/src/com/google/common/collect/ImmutableBiMap.java b/android/guava/src/com/google/common/collect/ImmutableBiMap.java
@@ -645,7 +645,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
    * {@code ImmutableBiMap}.
    *
    * @throws UnsupportedOperationException always
-   * @deprecated Use {@link ImmutableBiMap#toImmutableBiMap(Function, Function, BinaryOperator)}.
+   * @deprecated Merging values does not make sense for a {@code BiMap}.
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
   @Deprecated
diff --git a/android/guava/src/com/google/common/collect/Iterables.java b/android/guava/src/com/google/common/collect/Iterables.java
@@ -36,6 +36,7 @@
 import java.util.Queue;
 import java.util.RandomAccess;
 import java.util.Set;
+import java.util.stream.Stream;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
diff --git a/guava/src/com/google/common/collect/ImmutableBiMap.java b/guava/src/com/google/common/collect/ImmutableBiMap.java
@@ -665,7 +665,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
    * {@code ImmutableBiMap}.
    *
    * @throws UnsupportedOperationException always
-   * @deprecated Use {@link ImmutableBiMap#toImmutableBiMap(Function, Function, BinaryOperator)}.
+   * @deprecated Merging values does not make sense for a {@code BiMap}.
    */
   @Deprecated
   @DoNotCall("Use toImmutableBiMap")

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException`
`645`	`645`	`* {@code ImmutableBiMap}.`
`646`	`646`	`*`
`647`	`647`	`* @throws UnsupportedOperationException always`
`648`		`- * @deprecated Use {@link ImmutableBiMap#toImmutableBiMap(Function, Function, BinaryOperator)}.`
	`648`	`+ * @deprecated Merging values does not make sense for a {@code BiMap}.`
`649`	`649`	`* @since 33.2.0 (available since 21.0 in guava-jre)`
`650`	`650`	`*/`
`651`	`651`	`@Deprecated`
Original file line number	Diff line number	Diff line change
`@@ -665,7 +665,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException`
`665`	`665`	`* {@code ImmutableBiMap}.`
`666`	`666`	`*`
`667`	`667`	`* @throws UnsupportedOperationException always`
`668`		`- * @deprecated Use {@link ImmutableBiMap#toImmutableBiMap(Function, Function, BinaryOperator)}.`
	`668`	`+ * @deprecated Merging values does not make sense for a {@code BiMap}.`
`669`	`669`	`*/`
`670`	`670`	`@Deprecated`
`671`	`671`	`@DoNotCall("Use toImmutableBiMap")`