Skip to content

Commit 559d636

Browse files
cpovirkGoogle Java Core Libraries
authored and
Google Java Core Libraries
committed
Suppress NullableOptional, as we already do in, e.g., Truth.assertThat(Optional).
RELNOTES=n/a PiperOrigin-RevId: 609047209
1 parent 3efe353 commit 559d636

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@
3030
* @author Christian Gruber
3131
*/
3232
public final class GuavaOptionalSubject extends Subject {
33+
@SuppressWarnings("NullableOptional") // Truth always accepts nulls, no matter the type
3334
private final @Nullable Optional<?> actual;
3435

3536
GuavaOptionalSubject(
36-
FailureMetadata metadata, @Nullable Optional<?> actual, @Nullable String typeDescription) {
37+
FailureMetadata metadata,
38+
@SuppressWarnings("NullableOptional") // Truth always accepts nulls, no matter the type
39+
@Nullable Optional<?> actual,
40+
@Nullable String typeDescription) {
3741
super(metadata, actual, typeDescription);
3842
this.actual = actual;
3943
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@
3030
@SuppressWarnings("Java7ApiChecker") // used only from APIs with Java 8 in their signatures
3131
@IgnoreJRERequirement
3232
public final class OptionalSubject extends Subject {
33+
@SuppressWarnings("NullableOptional") // Truth always accepts nulls, no matter the type
3334
private final @Nullable Optional<?> actual;
3435

3536
OptionalSubject(
3637
FailureMetadata failureMetadata,
37-
@Nullable Optional<?> subject,
38+
@SuppressWarnings("NullableOptional") // Truth always accepts nulls, no matter the type
39+
@Nullable Optional<?> subject,
3840
@Nullable String typeDescription) {
3941
super(failureMetadata, subject, typeDescription);
4042
this.actual = subject;

0 commit comments

Comments
 (0)