From 21310f6bba380baaafef96cc9f4513ff409c931e Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 19 Jul 2024 10:48:33 -0700 Subject: [PATCH] Work around bugs in the forthcoming version of our nullness checker. RELNOTES=n/a PiperOrigin-RevId: 654056575 --- .../src/main/java/com/google/common/truth/MultimapSubject.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/google/common/truth/MultimapSubject.java b/core/src/main/java/com/google/common/truth/MultimapSubject.java index 96cef441b..6ccfc6752 100644 --- a/core/src/main/java/com/google/common/truth/MultimapSubject.java +++ b/core/src/main/java/com/google/common/truth/MultimapSubject.java @@ -34,6 +34,7 @@ import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.SetMultimap; import com.google.common.collect.Sets; @@ -587,7 +588,7 @@ public void containsEntry(@Nullable Object expectedKey, E expectedValue) { .add( fact( "found match (but failing because of exception)", - immutableEntry(expectedKey, actualValue))) + Maps.<@Nullable Object, A>immutableEntry(expectedKey, actualValue))) .add( fact( "full contents",