From 77cf12110647661a0cbb34db93805aeb717d796f Mon Sep 17 00:00:00 2001 From: jparachoniak Date: Fri, 10 Jan 2025 09:17:00 -0800 Subject: [PATCH] Changing Void to be annotated with @Nullable and updating any other needed types this should be a no-op for everything but J2KT. This change will prevent J2KT from erroneously null!!. This is valid because Void is always Nullable in Java (or the code can not execute). RELNOTES=n/a PiperOrigin-RevId: 714075337 --- android/guava/src/com/google/common/base/Suppliers.java | 2 +- guava/src/com/google/common/base/Suppliers.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/guava/src/com/google/common/base/Suppliers.java b/android/guava/src/com/google/common/base/Suppliers.java index 32b9fec0a92f..e99f73ec450a 100644 --- a/android/guava/src/com/google/common/base/Suppliers.java +++ b/android/guava/src/com/google/common/base/Suppliers.java @@ -174,7 +174,7 @@ static class NonSerializableMemoizingSupplier implem private final Object lock = new Object(); @SuppressWarnings("UnnecessaryLambda") // Must be a fixed singleton object - private static final Supplier SUCCESSFULLY_COMPUTED = + private static final Supplier<@Nullable Void> SUCCESSFULLY_COMPUTED = () -> { throw new IllegalStateException(); // Should never get called. }; diff --git a/guava/src/com/google/common/base/Suppliers.java b/guava/src/com/google/common/base/Suppliers.java index 32b9fec0a92f..e99f73ec450a 100644 --- a/guava/src/com/google/common/base/Suppliers.java +++ b/guava/src/com/google/common/base/Suppliers.java @@ -174,7 +174,7 @@ static class NonSerializableMemoizingSupplier implem private final Object lock = new Object(); @SuppressWarnings("UnnecessaryLambda") // Must be a fixed singleton object - private static final Supplier SUCCESSFULLY_COMPUTED = + private static final Supplier<@Nullable Void> SUCCESSFULLY_COMPUTED = () -> { throw new IllegalStateException(); // Should never get called. };