diff --git a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/sparql/engine/benchmark/QueryTaskResult.java b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/sparql/engine/benchmark/QueryTaskResult.java index a39401095be..1f009dfc077 100644 --- a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/sparql/engine/benchmark/QueryTaskResult.java +++ b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/sparql/engine/benchmark/QueryTaskResult.java @@ -20,12 +20,9 @@ */ package org.apache.jena.sparql.engine.benchmark; -import org.jspecify.annotations.NonNull; - public record QueryTaskResult(String queryString, String originalOpString, String optimizedOpString, long resultSetSize) { - @NonNull @Override public String toString() { return String.join("\n", diff --git a/jena-core/src/main/java/org/apache/jena/mem/collection/JenaSet.java b/jena-core/src/main/java/org/apache/jena/mem/collection/JenaSet.java index 1dc319d3152..0fc348f18d2 100644 --- a/jena-core/src/main/java/org/apache/jena/mem/collection/JenaSet.java +++ b/jena-core/src/main/java/org/apache/jena/mem/collection/JenaSet.java @@ -20,9 +20,8 @@ */ package org.apache.jena.mem.collection; -import org.jspecify.annotations.NonNull; - import java.util.Iterator; +import java.util.Objects; import java.util.Spliterator; import java.util.function.Consumer; @@ -64,7 +63,9 @@ default Spliterator spliterator() { } @Override - default @NonNull Iterator iterator() { - return this.keyIterator(); + default Iterator iterator() { + Iterator iter = this.keyIterator(); + Objects.requireNonNull(iter); + return iter; } } diff --git a/pom.xml b/pom.xml index 5b26e7b4b47..6a1846aa113 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 3.2.4 - 33.6.0-jre + 33.7.1-jre 2.14.0 10.3.1 @@ -102,7 +102,7 @@ 2.0.0-M5 0.7 - 1.17.0 + 1.17.1 1.6.20 5.12.0 @@ -437,6 +437,9 @@ + + + org.jspecify + jspecify + 1.0.1 + com.google.code.gson