Use Java 17

Author: mpkorstanje

java/src/main/java/io/cucumber/junitxmlformatter/EscapingXmlStreamWriter.java

@@ -56,7 +56,7 @@ void writeAttribute(String localName, String value) throws XMLStreamException {
 
     void writeCData(String data) throws XMLStreamException {
         // https://stackoverflow.com/questions/223652/is-there-a-way-to-escape-a-cdata-end-token-in-xml
-        for (String part : CDATA_TERMINATOR_SPLIT.split(data)) {
+        for (String part : CDATA_TERMINATOR_SPLIT.split(data, -1)) {
             // see https://www.w3.org/TR/xml/#dt-cdsection
             writer.writeCData(escapeIllegalChars(part));
         }
@@ -88,6 +88,7 @@ private static String escapeIllegalChars(String value) {
         return escaped.toString();
     }
 
+    @SuppressWarnings("UnnecessaryParentheses")
     private static boolean isLegal(int codePoint) {
         // see https://www.w3.org/TR/xml/#charsets
         return codePoint == 0x9

java/src/main/java/io/cucumber/junitxmlformatter/XmlReportData.java

@@ -129,7 +129,7 @@ List<TestCaseStarted> getAllTestCaseStarted() {
     }
 
     private static final io.cucumber.messages.types.Duration ZERO_DURATION =
-            new io.cucumber.messages.types.Duration(0L, 0L);
+            new io.cucumber.messages.types.Duration(0L, 0);
     // By definition, but see https://github.com/cucumber/gherkin/issues/11
     private static final TestStepResult SCENARIO_WITH_NO_STEPS = new TestStepResult(ZERO_DURATION, null, PASSED, null);
 

java/src/main/java/io/cucumber/junitxmlformatter/XmlReportWriter.java

@@ -53,7 +53,7 @@ private void writeSuiteAttributes(EscapingXmlStreamWriter writer) throws XMLStre
         Map<TestStepResultStatus, Long> counts = data.getTestCaseStatusCounts();
 
         writer.writeAttribute("tests", String.valueOf(data.getTestCaseCount()));
-        writer.writeAttribute("skipped", counts.get(SKIPPED).toString());
+        writer.writeAttribute("skipped", String.valueOf(counts.get(SKIPPED)));
         writer.writeAttribute("failures", String.valueOf(countFailures(counts)));
         writer.writeAttribute("errors", "0");
 

java/src/main/java/io/cucumber/junitxmlformatter/package-info.java

@@ -0,0 +1,4 @@
+@NullMarked
+package io.cucumber.junitxmlformatter;
+
+import org.jspecify.annotations.NullMarked;

java/src/test/java/io/cucumber/junitxmlformatter/Jackson.java

@@ -1,7 +1,6 @@
 package io.cucumber.junitxmlformatter;
 
 import com.fasterxml.jackson.annotation.JsonCreator.Mode;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,6 +10,9 @@
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT;
+import static com.fasterxml.jackson.annotation.JsonInclude.Value.construct;
+
 final class Jackson {
     public static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
             .addModule(new Jdk8Module())

java/src/test/java/io/cucumber/junitxmlformatter/MessagesToJunitXmlWriterAcceptanceTest.java

@@ -28,10 +28,11 @@
 import java.util.stream.Stream;
 
 import static io.cucumber.junitxmlformatter.Jackson.OBJECT_MAPPER;
+import static java.util.Objects.requireNonNull;
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 class MessagesToJunitXmlWriterAcceptanceTest {
-    private static final NdjsonToMessageIterable.Deserializer deserializer = (json) -> OBJECT_MAPPER.readValue(json, Envelope.class);
+    private static final NdjsonToMessageIterable.Deserializer deserializer = json -> OBJECT_MAPPER.readValue(json, Envelope.class);
 
     static List<TestCase> acceptance() throws IOException {
         try (Stream<Path> paths = Files.list(Paths.get("../testdata/src"))) {
@@ -107,14 +108,13 @@ private static <T extends OutputStream> T writeJunitXmlReport(TestCase testCase,
     static class TestCase {
         private final Path source;
         private final Path expected;
-
         private final String name;
 
         TestCase(Path source) {
             this.source = source;
             String fileName = source.getFileName().toString();
             this.name = fileName.substring(0, fileName.lastIndexOf(".ndjson"));
-            this.expected = source.getParent().resolve(name + ".xml");
+            this.expected = requireNonNull(source.getParent()).resolve(name + ".xml");
         }
 
         @Override
@@ -124,15 +124,13 @@ public String toString() {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            TestCase testCase = (TestCase) o;
-            return source.equals(testCase.source);
+            if (!(o instanceof TestCase testCase)) return false;
+            return Objects.equals(source, testCase.source) && Objects.equals(expected, testCase.expected) && Objects.equals(name, testCase.name);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(source);
+            return Objects.hash(source, expected, name);
         }
     }
 

java/src/test/java/io/cucumber/junitxmlformatter/MessagesToJunitXmlWriterTest.java

@@ -3,6 +3,7 @@
 import io.cucumber.messages.types.Envelope;
 import io.cucumber.messages.types.TestRunFinished;
 import io.cucumber.messages.types.TestRunStarted;
+import io.cucumber.messages.types.Timestamp;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
@@ -48,7 +49,9 @@ void it_throws_when_writing_after_close() throws IOException {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
         MessagesToJunitXmlWriter messagesToHtmlWriter = new MessagesToJunitXmlWriter(bytes);
         messagesToHtmlWriter.close();
-        assertThrows(IOException.class, () -> messagesToHtmlWriter.write(null));
+        assertThrows(IOException.class, () -> messagesToHtmlWriter.write(
+            Envelope.of(new TestRunStarted(new Timestamp(0L, 0), ""))
+        ));
     }
 
     @Test