Skip to content

Commit afda443

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Annotate formattingDiffsUsing methods as supporting nullable element/value types.
RELNOTES=n/a PiperOrigin-RevId: 647300691
1 parent ee680cb commit afda443

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

core/src/main/java/com/google/common/truth/Correspondence.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,13 @@ public String toString() {
325325
* diff-formatting functionality to it. See e.g. {@link IterableSubject#formattingDiffsUsing}.
326326
*/
327327
@SuppressWarnings("unchecked") // safe covariant cast
328-
static <T> Correspondence<T, T> equality() {
328+
static <T extends @Nullable Object> Correspondence<T, T> equality() {
329329
return (Equality<T>) Equality.INSTANCE;
330330
}
331331

332-
private static final class Equality<T> extends Correspondence<T, T> {
332+
private static final class Equality<T extends @Nullable Object> extends Correspondence<T, T> {
333333

334-
private static final Equality<Object> INSTANCE = new Equality<>();
334+
private static final Equality<@Nullable Object> INSTANCE = new Equality<>();
335335

336336
@Override
337337
public boolean compare(T actual, T expected) {

core/src/main/java/com/google/common/truth/IterableSubject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ UsingCorrespondence<A, E> comparingElementsUsing(
950950
*
951951
* @since 1.1
952952
*/
953-
public <T> UsingCorrespondence<T, T> formattingDiffsUsing(
953+
public <T extends @Nullable Object> UsingCorrespondence<T, T> formattingDiffsUsing(
954954
DiffFormatter<? super T, ? super T> formatter) {
955955
return comparingElementsUsing(Correspondence.<T>equality().formattingDiffsUsing(formatter));
956956
}

core/src/main/java/com/google/common/truth/MapSubject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ UsingCorrespondence<A, E> comparingValuesUsing(
528528
*
529529
* @since 1.1
530530
*/
531-
public final <V> UsingCorrespondence<V, V> formattingDiffsUsing(
531+
public final <V extends @Nullable Object> UsingCorrespondence<V, V> formattingDiffsUsing(
532532
DiffFormatter<? super V, ? super V> formatter) {
533533
return comparingValuesUsing(Correspondence.<V>equality().formattingDiffsUsing(formatter));
534534
}

0 commit comments

Comments
 (0)