diff options
| author | cpovirk <cpovirk@google.com> | 2021-06-15 11:15:55 -0700 |
|---|---|---|
| committer | Google Java Core Libraries <java-core-libraries-team+copybara@google.com> | 2021-06-15 11:18:16 -0700 |
| commit | fbf7b9635a8fb2affebfe8de033e593fe9595b89 (patch) | |
| tree | 5c685b828b847b38ba9c806e1b32aaa6acde975b | |
| parent | a902c9e225e0c022c4fecd6cbd735926cc6643bf (diff) | |
| download | guava-fbf7b9635a8fb2affebfe8de033e593fe9595b89.tar.gz | |
Add CheckForNull to Throwables.getCauseAs.
RELNOTES=n/a
PiperOrigin-RevId: 379532149
| -rw-r--r-- | android/guava/src/com/google/common/base/Throwables.java | 5 | ||||
| -rw-r--r-- | guava/src/com/google/common/base/Throwables.java | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/android/guava/src/com/google/common/base/Throwables.java b/android/guava/src/com/google/common/base/Throwables.java index 6f888d4ad..7832d186a 100644 --- a/android/guava/src/com/google/common/base/Throwables.java +++ b/android/guava/src/com/google/common/base/Throwables.java @@ -46,7 +46,7 @@ import javax.annotation.CheckForNull; * @since 1.0 */ @GwtCompatible(emulated = true) -// TODO(b/147136275): After adding @CheckForNull below, add @ElementTypesAreNonnullByDefault. +@ElementTypesAreNonnullByDefault public final class Throwables { private Throwables() {} @@ -332,8 +332,7 @@ public final class Throwables { */ @Beta @GwtIncompatible // Class.cast(Object) - @SuppressWarnings("nullness") - // TODO(b/147136275): After updating callers, add @CheckForNull, and remove @SuppressWarnings. + @CheckForNull public static <X extends Throwable> X getCauseAs( Throwable throwable, Class<X> expectedCauseType) { try { diff --git a/guava/src/com/google/common/base/Throwables.java b/guava/src/com/google/common/base/Throwables.java index 6f888d4ad..7832d186a 100644 --- a/guava/src/com/google/common/base/Throwables.java +++ b/guava/src/com/google/common/base/Throwables.java @@ -46,7 +46,7 @@ import javax.annotation.CheckForNull; * @since 1.0 */ @GwtCompatible(emulated = true) -// TODO(b/147136275): After adding @CheckForNull below, add @ElementTypesAreNonnullByDefault. +@ElementTypesAreNonnullByDefault public final class Throwables { private Throwables() {} @@ -332,8 +332,7 @@ public final class Throwables { */ @Beta @GwtIncompatible // Class.cast(Object) - @SuppressWarnings("nullness") - // TODO(b/147136275): After updating callers, add @CheckForNull, and remove @SuppressWarnings. + @CheckForNull public static <X extends Throwable> X getCauseAs( Throwable throwable, Class<X> expectedCauseType) { try { |