Restore JDK 8 compatibility

Author: marcphilipp

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ArgumentCountValidator.java

@@ -13,10 +13,10 @@
 import java.util.Arrays;
 import java.util.Optional;
 
-import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.params.ResolverFacade.RequiredParameterCount;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.Preconditions;
@@ -49,30 +49,33 @@ void validate(ExtensionContext extensionContext) {
 				int totalCount = this.arguments.getTotalLength();
 				Preconditions.condition(consumedCount == totalCount,
 					() -> wrongNumberOfArgumentsMessages("consumes", consumedCount, null, null));
-			}
-			default -> throw new ExtensionConfigurationException(
-				"Unsupported argument count validation mode: " + argumentCountValidationMode);
+				break;
+			default:
+				throw new ExtensionConfigurationException(
+					"Unsupported argument count validation mode: " + argumentCountValidationMode);
 		}
 	}
 
 	private void validateRequiredArgumentsArePresent() {
-		var requiredParameterCount = this.declarationContext.getResolverFacade().getRequiredParameterCount();
+		RequiredParameterCount requiredParameterCount = this.declarationContext.getResolverFacade().getRequiredParameterCount();
 		if (requiredParameterCount != null) {
-			var totalCount = this.arguments.getTotalLength();
+			int totalCount = this.arguments.getTotalLength();
 			Preconditions.condition(requiredParameterCount.value() <= totalCount,
 				() -> wrongNumberOfArgumentsMessages("has", requiredParameterCount.value(), "required",
 					requiredParameterCount.reason()));
 		}
 	}
 
-	private String wrongNumberOfArgumentsMessages(String verb, int actualCount, @Nullable String parameterAdjective,
-			@Nullable String reason) {
+	private String wrongNumberOfArgumentsMessages(String verb, int actualCount, String parameterAdjective,
+			String reason) {
 		int totalCount = this.arguments.getTotalLength();
-		return "Configuration error: @%s %s %s %s%s%s but there %s %s %s provided.%nNote: the provided arguments were %s".formatted(
+		return String.format(
+			"Configuration error: @%s %s %s %s%s%s but there %s %s %s provided.%nNote: the provided arguments were %s",
 			this.declarationContext.getAnnotationName(), verb, actualCount,
 			parameterAdjective == null ? "" : parameterAdjective + " ",
-			pluralize(actualCount, "parameter", "parameters"), reason == null ? "" : " (due to %s)".formatted(reason),
-			pluralize(totalCount, "was", "were"), totalCount, pluralize(totalCount, "argument", "arguments"),
+			pluralize(actualCount, "parameter", "parameters"),
+			reason == null ? "" : String.format(" (due to %s)", reason), pluralize(totalCount, "was", "were"),
+			totalCount, pluralize(totalCount, "argument", "arguments"),
 			Arrays.toString(this.arguments.getAllPayloads()));
 	}
 

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java

@@ -96,7 +96,8 @@ static ResolverFacade create(Class<?> clazz, List<Field> fields) {
 		Stream.concat(uniqueIndexedParameters.values().stream(), aggregatorParameters.stream()) //
 				.forEach(declaration -> makeAccessible(declaration.getField()));
 
-		var requiredParameterCount = new RequiredParameterCount(uniqueIndexedParameters.size(), "field injection");
+		RequiredParameterCount requiredParameterCount = new RequiredParameterCount(uniqueIndexedParameters.size(),
+			"field injection");
 
 		return new ResolverFacade(clazz, uniqueIndexedParameters, aggregatorParameters, 0, requiredParameterCount);
 	}
@@ -155,12 +156,12 @@ else if (aggregatorParameters.isEmpty()) {
 	private final Map<ParameterDeclaration, Resolver> resolvers;
 	private final DefaultParameterDeclarations indexedParameterDeclarations;
 	private final Set<? extends ResolvableParameterDeclaration> aggregatorParameters;
-	private final @Nullable RequiredParameterCount requiredParameterCount;
+	private final RequiredParameterCount requiredParameterCount;
 
 	private ResolverFacade(AnnotatedElement sourceElement,
 			NavigableMap<Integer, ? extends ResolvableParameterDeclaration> indexedParameters,
 			Set<? extends ResolvableParameterDeclaration> aggregatorParameters, int parameterIndexOffset,
-			@Nullable RequiredParameterCount requiredParameterCount) {
+			RequiredParameterCount requiredParameterCount) {
 		this.aggregatorParameters = aggregatorParameters;
 		this.parameterIndexOffset = parameterIndexOffset;
 		this.resolvers = new ConcurrentHashMap<>(indexedParameters.size() + aggregatorParameters.size());
@@ -172,7 +173,6 @@ ParameterDeclarations getIndexedParameterDeclarations() {
 		return this.indexedParameterDeclarations;
 	}
 
-	@Nullable
 	RequiredParameterCount getRequiredParameterCount() {
 		return this.requiredParameterCount;
 	}
@@ -781,6 +781,21 @@ public Object resolve(ParameterContext parameterContext, ExtensionContext extens
 		}
 	}
 
-	record RequiredParameterCount(int value, String reason) {
+	static class RequiredParameterCount {
+		private final int value;
+		private final String reason;
+
+		RequiredParameterCount(int value, String reason) {
+			this.value = value;
+			this.reason = reason;
+		}
+
+		int value() {
+			return value;
+		}
+
+		String reason() {
+			return reason;
+		}
 	}
 }