diff --git a/core/src/main/java/com/google/common/truth/Correspondence.java b/core/src/main/java/com/google/common/truth/Correspondence.java index bedb35ae3..f34066cbe 100644 --- a/core/src/main/java/com/google/common/truth/Correspondence.java +++ b/core/src/main/java/com/google/common/truth/Correspondence.java @@ -325,13 +325,13 @@ public String toString() { * diff-formatting functionality to it. See e.g. {@link IterableSubject#formattingDiffsUsing}. */ @SuppressWarnings("unchecked") // safe covariant cast - static Correspondence equality() { + static Correspondence equality() { return (Equality) Equality.INSTANCE; } - private static final class Equality extends Correspondence { + private static final class Equality extends Correspondence { - private static final Equality INSTANCE = new Equality<>(); + private static final Equality<@Nullable Object> INSTANCE = new Equality<>(); @Override public boolean compare(T actual, T expected) { diff --git a/core/src/main/java/com/google/common/truth/IterableSubject.java b/core/src/main/java/com/google/common/truth/IterableSubject.java index 312655837..c22f28682 100644 --- a/core/src/main/java/com/google/common/truth/IterableSubject.java +++ b/core/src/main/java/com/google/common/truth/IterableSubject.java @@ -950,7 +950,7 @@ UsingCorrespondence comparingElementsUsing( * * @since 1.1 */ - public UsingCorrespondence formattingDiffsUsing( + public UsingCorrespondence formattingDiffsUsing( DiffFormatter formatter) { return comparingElementsUsing(Correspondence.equality().formattingDiffsUsing(formatter)); } diff --git a/core/src/main/java/com/google/common/truth/MapSubject.java b/core/src/main/java/com/google/common/truth/MapSubject.java index b1009de9c..eb6f8d275 100644 --- a/core/src/main/java/com/google/common/truth/MapSubject.java +++ b/core/src/main/java/com/google/common/truth/MapSubject.java @@ -528,7 +528,7 @@ UsingCorrespondence comparingValuesUsing( * * @since 1.1 */ - public final UsingCorrespondence formattingDiffsUsing( + public final UsingCorrespondence formattingDiffsUsing( DiffFormatter formatter) { return comparingValuesUsing(Correspondence.equality().formattingDiffsUsing(formatter)); }