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 704a9e6c3..8059779e6 100644 --- a/core/src/main/java/com/google/common/truth/Correspondence.java +++ b/core/src/main/java/com/google/common/truth/Correspondence.java @@ -22,7 +22,7 @@ import static com.google.common.truth.Fact.fact; import static com.google.common.truth.Fact.simpleFact; import static com.google.common.truth.Platform.getStackTraceAsString; -import static java.util.Arrays.asList; +import static com.google.common.truth.SubjectUtils.asList; import com.google.common.base.Function; import com.google.common.base.Joiner; 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 edbd445a7..c95e98ec5 100644 --- a/core/src/main/java/com/google/common/truth/IterableSubject.java +++ b/core/src/main/java/com/google/common/truth/IterableSubject.java @@ -27,6 +27,7 @@ import static com.google.common.truth.IterableSubject.ElementFactGrouping.FACT_PER_ELEMENT; import static com.google.common.truth.SubjectUtils.accumulate; import static com.google.common.truth.SubjectUtils.annotateEmptyStrings; +import static com.google.common.truth.SubjectUtils.asList; import static com.google.common.truth.SubjectUtils.countDuplicates; import static com.google.common.truth.SubjectUtils.countDuplicatesAndAddTypeInfo; import static com.google.common.truth.SubjectUtils.countDuplicatesAndMaybeAddTypeInfoReturnObject; @@ -36,7 +37,6 @@ import static com.google.common.truth.SubjectUtils.iterableToList; import static com.google.common.truth.SubjectUtils.objectToTypeName; import static com.google.common.truth.SubjectUtils.retainMatchingToString; -import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.base.Objects; diff --git a/core/src/main/java/com/google/common/truth/SubjectUtils.java b/core/src/main/java/com/google/common/truth/SubjectUtils.java index ae55c0668..7668beb52 100644 --- a/core/src/main/java/com/google/common/truth/SubjectUtils.java +++ b/core/src/main/java/com/google/common/truth/SubjectUtils.java @@ -59,7 +59,7 @@ private SubjectUtils() {} if (rest == null) { items.add((T) null); } else { - items.addAll(Arrays.asList(rest)); + items.addAll(asList(rest)); } return items; } @@ -401,4 +401,9 @@ static ImmutableList append(ImmutableList list, E object) { static ImmutableList sandwich(E first, E[] array, E last) { return new ImmutableList.Builder().add(first).add(array).add(last).build(); } + + @SuppressWarnings("nullness") // TODO: b/316358623 - Remove suppression after fixing checker + static List asList(E... a) { + return Arrays.asList(a); + } }