From b94bccc38ae4570a26f77e68b1502bc2561e0623 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 16 Dec 2024 06:45:47 -0800 Subject: [PATCH] In `ClosingFuture`, remove a workaround for [JDK-7101822](https://bugs.openjdk.java.net/browse/JDK-7101822)(?) now that we [build with a JDK after JDK 8](https://github.com/google/guava/issues/6549). This follows up on cl/332225001 and cl/643394004. RELNOTES=n/a PiperOrigin-RevId: 706691218 --- .../src/com/google/common/util/concurrent/ClosingFuture.java | 4 +--- .../src/com/google/common/util/concurrent/ClosingFuture.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java b/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java index dfc34b1bd38a..9bc95f6de678 100644 --- a/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java @@ -1223,9 +1223,7 @@ private Peeker(ImmutableList> futures) { * .closing(executor); * } */ - // TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8. - @com.google.errorprone.annotations.DoNotMock( - "Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.") + @DoNotMock("Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.") public static class Combiner { private final CloseableList closeables = new CloseableList(); diff --git a/guava/src/com/google/common/util/concurrent/ClosingFuture.java b/guava/src/com/google/common/util/concurrent/ClosingFuture.java index 99b1d85548ca..747b3c6302e1 100644 --- a/guava/src/com/google/common/util/concurrent/ClosingFuture.java +++ b/guava/src/com/google/common/util/concurrent/ClosingFuture.java @@ -1228,9 +1228,7 @@ private Peeker(ImmutableList> futures) { * .closing(executor); * } */ - // TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8. - @com.google.errorprone.annotations.DoNotMock( - "Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.") + @DoNotMock("Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.") public static class Combiner { private final CloseableList closeables = new CloseableList();