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 2018/02/27 23:10:33 UTC
[13/24] jena git commit: Add parse(Model) and parse(Dataset)
Add parse(Model) and parse(Dataset)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/78903268
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/78903268
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/78903268
Branch: refs/heads/master
Commit: 78903268f7e48ab6672a183b5db46eeff963e6ea
Parents: c6e13b7
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 24 08:23:29 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 24 08:23:40 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RDFParser.java | 20 +++++++++++++++-
.../org/apache/jena/riot/RDFParserBuilder.java | 25 ++++++++++++++++++++
2 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/78903268/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
index 61d8724..ae5e675 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
@@ -36,6 +36,8 @@ import org.apache.jena.atlas.lib.InternalErrorException;
import org.apache.jena.atlas.web.ContentType;
import org.apache.jena.atlas.web.TypedInputStream;
import org.apache.jena.graph.Graph;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.rdf.model.Model;
import org.apache.jena.riot.process.normalize.StreamCanonicalLangTag;
import org.apache.jena.riot.process.normalize.StreamCanonicalLiterals;
import org.apache.jena.riot.system.*;
@@ -235,7 +237,15 @@ public class RDFParser {
parse(StreamRDFLib.graph(graph));
}
-
+ /**
+ * Parse the source, sending the results to a {@link Model}.
+ * The source must be for triples; any quads are discarded.
+ * This method is equivalent to {@code parse(model.getGraph())}.
+ */
+ public void parse(Model model) {
+ parse(model.getGraph());
+ }
+
/**
* Parse the source, sending the results to a {@link DatasetGraph}.
*/
@@ -243,6 +253,14 @@ public class RDFParser {
parse(StreamRDFLib.dataset(dataset));
}
+ /**
+ * Parse the source, sending the results to a {@link Dataset}.
+ * This method is equivalent to {@code parse(dataset.asDatasetGraph())}.
+ */
+ public void parse(Dataset dataset) {
+ parse(dataset.asDatasetGraph());
+ }
+
/**
* Parse the source, sending the results to a {@link StreamRDF}.
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/78903268/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
index 8efdfd6..6a596bf 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
@@ -30,6 +30,8 @@ import org.apache.http.message.BasicHeader;
import org.apache.jena.atlas.lib.IRILib;
import org.apache.jena.graph.BlankNodeId;
import org.apache.jena.graph.Graph;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.rdf.model.Model;
import org.apache.jena.riot.RDFParser.LangTagForm;
import org.apache.jena.riot.lang.LabelToNode;
import org.apache.jena.riot.system.*;
@@ -511,6 +513,18 @@ public class RDFParserBuilder {
}
/**
+ * Parse the source, sending the results to a {@link Model}.
+ * The source must be for triples; any quads are discarded.
+ * Short form for {@code build().parse(model)}
+ * which sends triples and prefixes to the {@code Model}.
+ *
+ * @param model
+ */
+ public void parse(Model model) {
+ build().parse(model);
+ }
+
+ /**
* Parse the source, sending the results to a {@link DatasetGraph}.
* Short form for {@code build().parse(dataset)}
* which sends triples and prefixes to the {@code DatasetGraph}.
@@ -521,6 +535,17 @@ public class RDFParserBuilder {
build().parse(dataset);
}
+ /**
+ * Parse the source, sending the results to a {@link Dataset}.
+ * Short form for {@code build().parse(dataset)}
+ * which sends triples and prefixes to the {@code Dataset}.
+ *
+ * @param dataset
+ */
+ public void parse(Dataset dataset) {
+ build().parse(dataset);
+ }
+
/** Build an {@link RDFParser}. The parser takes it's configuration from this builder and can not then be changed.
* The source must be set.
* When a parser is used, it is takes the source and sends output to an {@link StreamRDF}.