Enable NullAway in junit-platform-suite-commons

Author: marcphilipp

junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
 	id("junitbuild.java-library-conventions")
+	id("junitbuild.java-nullability-conventions")
 }
 
 description = "JUnit Platform Suite Commons"
@@ -9,6 +10,7 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
+	compileOnly(libs.jspecify)
 
 	implementation(projects.junitPlatformEngine)
 	implementation(projects.junitPlatformSuiteApi)

junit-platform-suite-commons/src/main/java/module-info.java

@@ -8,11 +8,14 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
+import org.jspecify.annotations.NullMarked;
+
 /**
  * Common support utilities for declarative test suites.
  *
  * @since 1.8
  */
+@NullMarked
 module org.junit.platform.suite.commons {
 	requires static transitive org.apiguardian.api;
 	requires org.junit.platform.suite.api;

junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java

@@ -32,6 +32,7 @@
 import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
+import org.jspecify.annotations.Nullable;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.ConfigurationParameters;
@@ -120,7 +121,10 @@ public final class SuiteLauncherDiscoveryRequestBuilder {
 	private final Set<String> selectedClassNames = new LinkedHashSet<>();
 	private boolean includeClassNamePatternsUsed;
 	private boolean filterStandardClassNamePatterns = false;
+
+	@Nullable
 	private ConfigurationParameters parentConfigurationParameters;
+
 	private boolean enableParentConfigurationParameters = true;
 
 	private SuiteLauncherDiscoveryRequestBuilder() {
@@ -516,14 +520,16 @@ private static MethodSelector toMethodSelectorFromFQMN(Class<?> suiteClass, Sele
 		return DiscoverySelectors.selectMethod(annotation.value());
 	}
 
-	private static MethodSelector toMethodSelector(Class<?> suiteClass, Class<?> type, String typeName,
-			Class<?>[] parameterTypes, String methodName, String parameterTypeNames) {
+	private static MethodSelector toMethodSelector(Class<?> suiteClass, @Nullable Class<?> type,
+			@Nullable String typeName, Class<?> @Nullable [] parameterTypes, String methodName,
+			String parameterTypeNames) {
 		if (type == null) {
-			Preconditions.notBlank(typeName, () -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
-				"type must be set or type name must not be blank"));
+			String nonBlankTypeName = Preconditions.notBlank(typeName,
+				() -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+					"type must be set or type name must not be blank"));
 			return parameterTypes == null //
-					? DiscoverySelectors.selectMethod(typeName, methodName, parameterTypeNames) //
-					: DiscoverySelectors.selectMethod(typeName, methodName, parameterTypes);
+					? DiscoverySelectors.selectMethod(nonBlankTypeName, methodName, parameterTypeNames) //
+					: DiscoverySelectors.selectMethod(nonBlankTypeName, methodName, parameterTypes);
 		}
 		else {
 			Preconditions.condition(typeName == null, () -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,