Browse Source

Add nullability annotations to tests in module/spring-boot-validation

See gh-47263
pull/47637/head
Moritz Halbritter 2 months ago
parent
commit
866be19024
  1. 4
      module/spring-boot-validation/build.gradle
  2. 5
      module/spring-boot-validation/src/test/java/org/springframework/boot/validation/autoconfigure/ValidatorAdapterTests.java

4
module/spring-boot-validation/build.gradle

@ -36,3 +36,7 @@ dependencies { @@ -36,3 +36,7 @@ dependencies {
testRuntimeOnly("ch.qos.logback:logback-classic")
}
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}

5
module/spring-boot-validation/src/test/java/org/springframework/boot/validation/autoconfigure/ValidatorAdapterTests.java

@ -21,6 +21,7 @@ import java.util.HashMap; @@ -21,6 +21,7 @@ import java.util.HashMap;
import jakarta.validation.Validator;
import jakarta.validation.constraints.Min;
import org.hibernate.validator.HibernateValidator;
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.FilteredClassLoader;
@ -173,8 +174,8 @@ class ValidatorAdapterTests { @@ -173,8 +174,8 @@ class ValidatorAdapterTests {
@Override
@SuppressWarnings("unchecked")
public <T> T unwrap(Class<T> type) {
if (type.isInstance(this.delegate)) {
public <T> @Nullable T unwrap(@Nullable Class<T> type) {
if (type != null && type.isInstance(this.delegate)) {
return (T) this.delegate;
}
return this.delegate.unwrap(type);

Loading…
Cancel
Save