You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2019/03/23 10:47:01 UTC
[jena] branch master updated: JENA-1692: Add jsonld to model and
dataset results formats.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new 1cca775 JENA-1692: Add jsonld to model and dataset results formats.
1cca775 is described below
commit 1cca775bbf0bb0fd3ee8ac55e31f0f30cdde3b77
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Mar 23 10:44:50 2019 +0000
JENA-1692: Add jsonld to model and dataset results formats.
---
.../java/org/apache/jena/sparql/resultset/ResultsFormat.java | 10 ++++++++--
.../main/java/org/apache/jena/sparql/util/QueryExecUtils.java | 10 ++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
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 9674fae..d7cf189 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
@@ -69,6 +69,7 @@ public class ResultsFormat extends Symbol
static public ResultsFormat FMT_RDF_NT = new ResultsFormat(contentTypeNTriples) ;
static public ResultsFormat FMT_RDF_TRIG = new ResultsFormat(contentTypeTriG) ;
static public ResultsFormat FMT_RDF_NQ = new ResultsFormat(contentTypeNQuads) ;
+ static public ResultsFormat FMT_RDF_JSONLD = new ResultsFormat(contentTypeJSONLD) ;
static public ResultsFormat FMT_UNKNOWN = new ResultsFormat("unknown") ;
// ---- Compatibility
@@ -82,7 +83,6 @@ public class ResultsFormat extends Symbol
names.put("json", FMT_RS_JSON) ;
names.put("srj", FMT_RS_JSON) ;
names.put("srt", FMT_RS_THRIFT) ;
- names.put("thrift", FMT_RS_THRIFT) ;
names.put("sse", FMT_RS_SSE) ;
names.put("csv", FMT_RS_CSV) ;
@@ -102,12 +102,13 @@ public class ResultsFormat extends Symbol
names.put("nt", FMT_RDF_NT) ;
names.put("n-triples", FMT_RDF_NT) ;
names.put("ntriples", FMT_RDF_NT) ;
+ names.put("jsonld", FMT_RDF_JSONLD) ;
+ names.put("json-ld", FMT_RDF_JSONLD) ;
names.put("nq", FMT_RDF_NQ) ;
names.put("nquads", FMT_RDF_NQ) ;
names.put("n-quads", FMT_RDF_NQ) ;
names.put("trig", FMT_RDF_TRIG) ;
-
}
public static ResultsFormat guessSyntax(String url) {
@@ -237,6 +238,11 @@ public class ResultsFormat extends Symbol
return true;
}
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_JSONLD) ) {
+ RDFOutput.outputAsRDF(out, "JSONLD", resultSet) ;
+ return true;
+ }
+
if ( outputFormat.equals(ResultsFormat.FMT_TUPLES) ) {
PlainFormat pFmt = new PlainFormat(out, prologue) ;
ResultSetApply a = new ResultSetApply(resultSet, pFmt) ;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
index 2a46a82..0628fff 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
@@ -214,6 +214,11 @@ public class QueryExecUtils {
return ;
}
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_JSONLD) ) {
+ RDFDataMgr.write(System.out, model, Lang.JSONLD) ;
+ return ;
+ }
+
System.err.println("Unknown format: " + outputFormat) ;
}
@@ -241,6 +246,11 @@ public class QueryExecUtils {
return ;
}
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_JSONLD) ) {
+ RDFDataMgr.write(System.out, dataset, Lang.JSONLD);
+ return ;
+ }
+
System.err.println("Unknown format: " + outputFormat) ;
}