Use Java 17

Author: mpkorstanje

java/src/test/java/io/cucumber/cucumberexpressions/CucumberExpressionTest.java

@@ -1,5 +1,6 @@
 package io.cucumber.cucumberexpressions;
 
+import org.hamcrest.CoreMatchers;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
@@ -25,12 +26,16 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static java.nio.file.Files.newDirectoryStream;
 import static java.nio.file.Files.newInputStream;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static java.util.Objects.requireNonNull;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.Is.is;
@@ -57,34 +62,29 @@ static List<Path> acceptance_tests_pass() throws IOException {
     void acceptance_tests_pass(@ConvertWith(Converter.class) Expectation expectation) {
         if (expectation.exception == null) {
             CucumberExpression expression = new CucumberExpression(expectation.expression, parameterTypeRegistry);
-            List<Argument<?>> match = expression.match(expectation.text);
+            List<Argument<?>> match = expression.match(requireNonNull(expectation.text));
             List<?> values = match == null ? null : match.stream()
                     .map(Argument::getValue)
                     .collect(Collectors.toList());
 
-            assertThat(values, CustomMatchers.equalOrCloseTo(expectation.expectedArgs));
+            if (expectation.expectedArgs == null) {
+                assertThat(values, nullValue());
+            } else {
+                assertThat(values, CustomMatchers.equalOrCloseTo(expectation.expectedArgs));
+            }
         } else {
             Executable executable = () -> {
                 CucumberExpression expression = new CucumberExpression(expectation.expression, parameterTypeRegistry);
-                expression.match(expectation.text);
+                if (expectation.text != null) {
+                    expression.match(expectation.text);
+                }
             };
             CucumberExpressionException exception = assertThrows(CucumberExpressionException.class, executable);
             assertThat(exception.getMessage(), equalTo(expectation.exception));
         }
     }
 
-    static class Expectation {
-        public final String expression;
-        public final String text;
-        public final List<?> expectedArgs;
-        public final @Nullable String exception;
-
-        Expectation(String expression, String text, List<?> expectedArgs, String exception) {
-            this.expression = expression;
-            this.text = text;
-            this.expectedArgs = expectedArgs;
-            this.exception = exception;
-        }
+    public record Expectation(String expression, @Nullable String text, @Nullable List<?> expectedArgs, @Nullable String exception) {
     }
 
     @NullMarked
@@ -100,7 +100,13 @@ public Expectation convert(@Nullable Object source, ParameterContext context) th
             try {
                 Path path = (Path) source;
                 InputStream inputStream = newInputStream(path);
-                return yaml.loadAs(inputStream, Expectation.class);
+                Map<String, ?> document = yaml.loadAs(inputStream, Map.class);
+                return new Expectation(
+                        (String) requireNonNull(document.get("expression")),
+                        (String) document.get("text"),
+                        (List<?>) document.get("expected_args"),
+                        (String) document.get("exception")
+                );
             } catch (IOException e) {
                 throw new ArgumentConversionException("Could not load " + source, e);
             }

java/src/test/java/io/cucumber/cucumberexpressions/CustomParameterTypeTest.java

@@ -94,7 +94,7 @@ void warns_when_CucumberExpression_parameters_with_multiple_capture_groups_has_a
                 "coordinate",
                 "(\\d+),\\s*(\\d+),\\s*(\\d+)",
                 Coordinate.class,
-                (@Nullable String[] args) -> {
+                (@Nullable String arg) -> {
                     throw new IllegalStateException();
                 },
                 false,