Change assertThat(array) to allow arrays of non-nullable elements

martinkretzschmar · Google Java Core Libraries · commit 5efd53f1064b · 2024-02-20T07:04:34.000-08:00
Though array types are covariant in Java, in Kotlin they are not and this
change makes it easier to translate Java callers to Kotlin with J2KT.

RELNOTES=n/a
PiperOrigin-RevId: 608590844
diff --git a/core/src/main/java/com/google/common/truth/ObjectArraySubject.java b/core/src/main/java/com/google/common/truth/ObjectArraySubject.java
@@ -26,10 +26,9 @@
  * @author Christian Gruber
  */
 public final class ObjectArraySubject<T extends @Nullable Object> extends AbstractArraySubject {
-  private final @Nullable T @Nullable [] actual;
+  private final T @Nullable [] actual;
 
-  ObjectArraySubject(
-      FailureMetadata metadata, @Nullable T @Nullable [] o, @Nullable String typeDescription) {
+  ObjectArraySubject(FailureMetadata metadata, T @Nullable [] o, @Nullable String typeDescription) {
     super(metadata, o, typeDescription);
     this.actual = o;
   }
diff --git a/core/src/main/java/com/google/common/truth/StandardSubjectBuilder.java b/core/src/main/java/com/google/common/truth/StandardSubjectBuilder.java
@@ -121,7 +121,7 @@ public final IterableSubject that(@Nullable Iterable<?> actual) {
   }
 
   @SuppressWarnings("AvoidObjectArrays")
-  public final <T> ObjectArraySubject<T> that(@Nullable T @Nullable [] actual) {
+  public final <T extends @Nullable Object> ObjectArraySubject<T> that(T @Nullable [] actual) {
     return new ObjectArraySubject<>(metadata(), actual, "array");
   }
 
diff --git a/core/src/main/java/com/google/common/truth/Truth.java b/core/src/main/java/com/google/common/truth/Truth.java
@@ -201,7 +201,8 @@ public static IterableSubject assertThat(@Nullable Iterable<?> actual) {
   }
 
   @SuppressWarnings("AvoidObjectArrays")
-  public static <T> ObjectArraySubject<T> assertThat(@Nullable T @Nullable [] actual) {
+  public static <T extends @Nullable Object> ObjectArraySubject<T> assertThat(
+      T @Nullable [] actual) {
     return assert_().that(actual);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public final IterableSubject that(@Nullable Iterable<?> actual) {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`@SuppressWarnings("AvoidObjectArrays")`
`124`		`- public final <T> ObjectArraySubject<T> that(@Nullable T @Nullable [] actual) {`
	`124`	`+ public final <T extends @Nullable Object> ObjectArraySubject<T> that(T @Nullable [] actual) {`
`125`	`125`	`return new ObjectArraySubject<>(metadata(), actual, "array");`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,8 @@ public static IterableSubject assertThat(@Nullable Iterable<?> actual) {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`@SuppressWarnings("AvoidObjectArrays")`
`204`		`- public static <T> ObjectArraySubject<T> assertThat(@Nullable T @Nullable [] actual) {`
	`204`	`+ public static <T extends @Nullable Object> ObjectArraySubject<T> assertThat(`
	`205`	`+ T @Nullable [] actual) {`
`205`	`206`	`return assert_().that(actual);`
`206`	`207`	`}`
`207`	`208`