This is an automated email from the ASF dual-hosted git repository.
afs pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new c469bd8994 GH-4349: fix NPE in format guess in rset command
c469bd8994 is described below
commit c469bd89948a1d3b51746b611865d93c6ad74c92
Author: Ostrzyciel <[email protected]>
AuthorDate: Thu Oct 22 23:38:11 2026 +0200
GH-4349: fix NPE in format guess in rset command
---
.../org/apache/jena/sparql/resultset/ResultsFormat.java | 2 +-
.../apache/jena/sparql/resultset/TestResultsFormat.java | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java
b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java
index 141bdf322e..9415cecb81 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsFormat.java
@@ -111,7 +111,7 @@ public enum ResultsFormat {
// return null;
ResultsFormat[] enums = ResultsFormat.values();
for ( ResultsFormat rsFmt : enums ) {
- if ( rsFmt.resultSetLang().equals(rsLang) )
+ if ( rsLang.equals(rsFmt.resultSetLang()) )
return rsFmt;
}
return null;
diff --git
a/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultsFormat.java
b/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultsFormat.java
index 91b822636d..c7021a1c7a 100644
---
a/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultsFormat.java
+++
b/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultsFormat.java
@@ -29,9 +29,12 @@ import org.junit.jupiter.api.Test;
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFFormat;
import org.apache.jena.riot.resultset.ResultSetLang;
+import org.apache.jena.sys.JenaSystem;
public class TestResultsFormat {
+ static { JenaSystem.init(); }
+
@Test public void entry_srj() { test("srj", ResultsFormat.JSON,
ResultSetLang.RS_JSON, RDFFormat.JSONLD, RDFFormat.JSONLD); }
@Test public void entry_srx() { test("srx", ResultsFormat.XML,
ResultSetLang.RS_XML, RDFFormat.RDFXML, null); }
@@ -58,6 +61,12 @@ public class TestResultsFormat {
@Test public void entry_bad() { testBad("SHACL"); }
+ @Test public void guess_srj() { testGuess("results.srj",
ResultsFormat.JSON); }
+ @Test public void guess_srx() { testGuess("results.srx",
ResultsFormat.XML); }
+ @Test public void guess_none() { testGuess("results.unknown", null); }
+ @Test public void guess_ttl() { testGuess("results.ttl", null); }
+ @Test public void guess_nt() { testGuess("results.nt", null); }
+
private void test(String string, ResultsFormat expected, Lang rsLang,
RDFFormat triplesFormat, RDFFormat quadsFormat) {
ResultsFormat rFmt = ResultsFormat.lookup(string);
assertEquals(expected, rFmt);
@@ -66,6 +75,11 @@ public class TestResultsFormat {
assertEquals(quadsFormat, rFmt.quadsFormat());
}
+ private void testGuess(String filename, ResultsFormat expected) {
+ ResultsFormat rFmt = ResultsFormat.guessSyntax(filename);
+ assertEquals(expected, rFmt);
+ }
+
private void testBad(String string) {
ResultsFormat rFmt = ResultsFormat.lookup(string);
assertNull(rFmt);