Replace calls to deprecated RDFDataMgr.parse operations.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/931a437b Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/931a437b Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/931a437b Branch: refs/heads/master Commit: 931a437bb49fecdb1cb70a5e6225e27141dec86c Parents: 6853d82 Author: Andy Seaborne <[email protected]> Authored: Sun May 28 19:49:13 2017 +0100 Committer: Andy Seaborne <[email protected]> Committed: Sun May 28 19:49:13 2017 +0100 ---------------------------------------------------------------------- .../arq/examples/riot/ExRIOT_2.java | 8 ------ .../arq/examples/riot/ExRIOT_4.java | 6 ++--- .../arq/examples/riot/ExRIOT_6.java | 5 ++-- .../arq/examples/riot/ExRIOT_7.java | 4 +-- .../apache/jena/riot/web/HttpResponseLib.java | 7 ++--- .../jena/sparql/modify/UpdateEngineWorker.java | 28 ++++++++------------ .../jena/riot/lang/TestPipedRDFIterators.java | 6 ++--- .../org/apache/jena/riot/lang/TestTriXBad.java | 4 +-- .../apache/jena/fuseki/mgt/ActionDatasets.java | 12 ++++----- .../jena/fuseki/migrate/GraphLoadUtils.java | 5 ++-- .../validation/json/DataValidatorJSON.java | 3 +-- .../org/apache/jena/fuseki/TestDatasetOps.java | 18 +++++++------ 12 files changed, 44 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java ---------------------------------------------------------------------- diff --git a/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java b/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java index e69cb61..34ba514 100644 --- a/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java +++ b/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java @@ -22,7 +22,6 @@ import java.io.FileInputStream ; import java.io.IOException ; import java.io.InputStream ; -import org.apache.jena.riot.RDFDataMgr ; import org.apache.jena.riot.RDFLanguages ; import org.apache.jena.riot.RDFParser ; import org.apache.jena.riot.system.ErrorHandlerFactory ; @@ -31,8 +30,6 @@ import org.apache.jena.riot.system.StreamRDFLib ; /** Example of using RIOT directly. * - * RDFDataMgr is the general place to read data. - * * The parsers produce a stream of triples and quads so processing does not need * to hold everything in memory at the same time. See also {@code ExRIOT_4} */ @@ -43,11 +40,6 @@ public class ExRIOT_2 // ---- Parse to a Sink. StreamRDF noWhere = StreamRDFLib.sinkNull() ; - // RIOT controls the conversion from bytes to java chars. - try (InputStream in = new FileInputStream("data.trig")) { - RDFDataMgr.parse(noWhere, in, "http://example/base";, RDFLanguages.TRIG) ; - } - // --- Or create a parser and do the parsing with detailed setup. String baseURI = "http://example/base"; ; http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-arq/src-examples/arq/examples/riot/ExRIOT_4.java ---------------------------------------------------------------------- diff --git a/jena-arq/src-examples/arq/examples/riot/ExRIOT_4.java b/jena-arq/src-examples/arq/examples/riot/ExRIOT_4.java index 9de9a2e..38bbb86 100644 --- a/jena-arq/src-examples/arq/examples/riot/ExRIOT_4.java +++ b/jena-arq/src-examples/arq/examples/riot/ExRIOT_4.java @@ -22,7 +22,7 @@ import org.apache.jena.atlas.lib.Sink ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; import org.apache.jena.rdf.model.Property ; -import org.apache.jena.riot.RDFDataMgr ; +import org.apache.jena.riot.RDFParser ; import org.apache.jena.riot.out.SinkTripleOutput ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFBase ; @@ -41,8 +41,8 @@ public class ExRIOT_4 Sink<Triple> output = new SinkTripleOutput(System.out, null, SyntaxLabels.createNodeToLabel()) ; StreamRDF filtered = new FilterSinkRDF(output, FOAF.name, FOAF.knows) ; - // Call the parsing process. - RDFDataMgr.parse(filtered, filename) ; + // Call the parsing process. + RDFParser.source(filename).parse(filtered); } static class FilterSinkRDF extends StreamRDFBase http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-arq/src-examples/arq/examples/riot/ExRIOT_6.java ---------------------------------------------------------------------- diff --git a/jena-arq/src-examples/arq/examples/riot/ExRIOT_6.java b/jena-arq/src-examples/arq/examples/riot/ExRIOT_6.java index 4dbd191..4ca85e8 100644 --- a/jena-arq/src-examples/arq/examples/riot/ExRIOT_6.java +++ b/jena-arq/src-examples/arq/examples/riot/ExRIOT_6.java @@ -22,7 +22,7 @@ import java.util.concurrent.ExecutorService ; import java.util.concurrent.Executors ; import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.RDFDataMgr ; +import org.apache.jena.riot.RDFParser ; import org.apache.jena.riot.lang.PipedRDFIterator ; import org.apache.jena.riot.lang.PipedRDFStream ; import org.apache.jena.riot.lang.PipedTriplesStream ; @@ -53,8 +53,7 @@ public class ExRIOT_6 { @Override public void run() { - // Call the parsing process. - RDFDataMgr.parse(inputStream, filename); + RDFParser.source(filename).parse(inputStream); } }; http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-arq/src-examples/arq/examples/riot/ExRIOT_7.java ---------------------------------------------------------------------- diff --git a/jena-arq/src-examples/arq/examples/riot/ExRIOT_7.java b/jena-arq/src-examples/arq/examples/riot/ExRIOT_7.java index 0d16b74..ee34407 100644 --- a/jena-arq/src-examples/arq/examples/riot/ExRIOT_7.java +++ b/jena-arq/src-examples/arq/examples/riot/ExRIOT_7.java @@ -19,7 +19,7 @@ package arq.examples.riot; import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.RDFDataMgr; +import org.apache.jena.riot.RDFParser ; import org.apache.jena.riot.lang.CollectorStreamBase; import org.apache.jena.riot.lang.CollectorStreamTriples; @@ -38,7 +38,7 @@ public class ExRIOT_7 { final String filename = "data.ttl"; CollectorStreamTriples inputStream = new CollectorStreamTriples(); - RDFDataMgr.parse(inputStream, filename); + RDFParser.source(filename).parse(inputStream); for (Triple triple : inputStream.getCollected()) { System.out.println(triple); http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java index d6e87b9..9a9c83b 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java @@ -31,10 +31,7 @@ import org.apache.jena.atlas.io.IO ; import org.apache.jena.graph.Graph ; import org.apache.jena.query.ResultSet ; import org.apache.jena.query.ResultSetFactory ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.RDFDataMgr ; -import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.riot.WebContent ; +import org.apache.jena.riot.* ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFLib ; import org.apache.jena.sparql.graph.GraphFactory ; @@ -60,7 +57,7 @@ public class HttpResponseLib Lang lang = RDFLanguages.contentTypeToLang(ct) ; StreamRDF dest = StreamRDFLib.graph(g) ; try(InputStream in = entity.getContent()) { - RDFDataMgr.parse(dest, in, baseIRI, lang) ; + RDFParser.source(in).lang(lang).base(baseIRI).parse(dest); } this.graph = g ; } catch (IOException ex) { IO.exception(ex) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java index a94f4e2..0b9d97d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java @@ -33,7 +33,6 @@ import org.apache.jena.atlas.data.ThresholdPolicyFactory ; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.lib.Pair ; import org.apache.jena.atlas.lib.Sink ; -import org.apache.jena.atlas.web.TypedInputStream ; import org.apache.jena.graph.Graph ; import org.apache.jena.graph.GraphUtil ; import org.apache.jena.graph.Node ; @@ -41,11 +40,9 @@ import org.apache.jena.graph.Triple ; import org.apache.jena.query.Query ; import org.apache.jena.query.QueryExecutionFactory ; import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.RDFDataMgr ; import org.apache.jena.riot.RDFLanguages ; +import org.apache.jena.riot.RDFParser ; import org.apache.jena.riot.system.SerializationFactoryFinder ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.riot.system.StreamRDFLib ; import org.apache.jena.sparql.ARQInternalErrorException ; import org.apache.jena.sparql.SystemARQ ; import org.apache.jena.sparql.core.* ; @@ -142,23 +139,20 @@ public class UpdateEngineWorker implements UpdateVisitor Node dest = update.getDest(); try { // Read into temporary storage to protect against parse errors. - TypedInputStream s = RDFDataMgr.open(source); - Lang lang = RDFDataMgr.determineLang(source, s.getContentType(), null); - - if ( RDFLanguages.isTriples(lang) ) { - // Triples + if ( dest != null ) { + Lang lang = RDFLanguages.filenameToLang(source); + // load-to-graph - must be triples. + if ( ! RDFLanguages.isTriples(lang) ) + throw new UpdateException("Attempt to load quads into a graph"); + // LOAD-INTO graph ... must be triples. Graph g = GraphFactory.createGraphMem(); - StreamRDF stream = StreamRDFLib.graph(g); - RDFDataMgr.parse(stream, s, source); + RDFParser.source(source).parse(g); Graph g2 = graph(datasetGraph, dest); GraphUtil.addInto(g2, g); } else { - // Quads - if ( dest != null ) - throw new UpdateException("Attempt to load quads into a graph"); + // LOAD <iri> -- allow quads. DatasetGraph dsg = DatasetGraphFactory.create(); - StreamRDF stream = StreamRDFLib.dataset(dsg); - RDFDataMgr.parse(stream, s, source); + RDFParser.source(source).parse(dsg); Iterator<Quad> iter = dsg.find(); for ( ; iter.hasNext() ; ) { Quad q = iter.next(); @@ -169,7 +163,7 @@ public class UpdateEngineWorker implements UpdateVisitor catch (RuntimeException ex) { if ( !update.getSilent() ) { if ( ex instanceof UpdateException ) - throw (UpdateException)ex; + throw ex; throw new UpdateException("Failed to LOAD '" + source + "'", ex); } } http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java index 1dcd9a7..a8e6b94 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java @@ -24,8 +24,8 @@ import java.nio.charset.StandardCharsets ; import java.util.concurrent.* ; import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.RDFDataMgr ; -import org.apache.jena.riot.RDFLanguages ; +import org.apache.jena.riot.Lang ; +import org.apache.jena.riot.RDFParser ; import org.apache.jena.riot.RiotException ; import org.apache.jena.sparql.core.Quad ; import org.apache.jena.sparql.util.NodeFactoryExtra ; @@ -396,7 +396,7 @@ public class TestPipedRDFIterators { Charset utf8 = StandardCharsets.UTF_8 ; ByteArrayInputStream input = new ByteArrayInputStream(data.getBytes(utf8)); try { - RDFDataMgr.parse(out, input, RDFLanguages.TURTLE); + RDFParser.source(input).lang(Lang.TTL).parse(out); } catch (Throwable t) { // Ignore the error } http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java index 849e74b..e6bc896 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java @@ -23,7 +23,7 @@ import java.util.Arrays ; import org.apache.jena.atlas.io.IO ; import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.RDFDataMgr ; +import org.apache.jena.riot.RDFParser ; import org.apache.jena.riot.RiotException ; import org.apache.jena.riot.system.ErrorHandler ; import org.apache.jena.riot.system.ErrorHandlerFactory ; @@ -67,7 +67,7 @@ public class TestTriXBad extends Assert /*BaseTest*/ { ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerSimple()) ; InputStream in = IO.openFile(fInput) ; StreamRDF sink = StreamRDFLib.sinkNull() ; - RDFDataMgr.parse(sink, in, Lang.TRIX) ; + RDFParser.source(in).lang(Lang.TRIX).parse(sink); } finally { ErrorHandlerFactory.setDefaultErrorHandler(err) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java index 97e52cc..4be5cef 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java @@ -41,7 +41,10 @@ import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.atlas.web.ContentType ; import org.apache.jena.datatypes.xsd.XSDDatatype ; import org.apache.jena.fuseki.FusekiLib ; -import org.apache.jena.fuseki.build.* ; +import org.apache.jena.fuseki.build.DatasetDescriptionRegistry ; +import org.apache.jena.fuseki.build.FusekiBuilder ; +import org.apache.jena.fuseki.build.Template ; +import org.apache.jena.fuseki.build.TemplateFunctions ; import org.apache.jena.fuseki.server.* ; import org.apache.jena.fuseki.servlets.* ; import org.apache.jena.graph.Node ; @@ -49,10 +52,7 @@ import org.apache.jena.graph.NodeFactory ; import org.apache.jena.query.Dataset ; import org.apache.jena.query.ReadWrite ; import org.apache.jena.rdf.model.* ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.RDFDataMgr ; -import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.riot.WebContent ; +import org.apache.jena.riot.* ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFLib ; import org.apache.jena.shared.uuid.JenaUUID ; @@ -292,7 +292,7 @@ public class ActionDatasets extends ActionContainerItem { template = TemplateFunctions.templateFile(Template.templateTDBFN, params, Lang.TTL) ; if ( dbType.equalsIgnoreCase(tDatabasetMem)) template = TemplateFunctions.templateFile(Template.templateMemFN, params, Lang.TTL) ; - RDFDataMgr.parse(dest, new StringReader(template), "http://base/";, Lang.TTL) ; + RDFParser.create().source(new StringReader(template)).base("http://base/";).lang(Lang.TTL).parse(dest); } private static void assemblerFromUpload(HttpAction action, StreamRDF dest) { http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java index 7a7121f..020065f 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java @@ -25,7 +25,7 @@ import org.apache.jena.graph.Factory ; import org.apache.jena.graph.Graph ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; -import org.apache.jena.riot.RDFDataMgr ; +import org.apache.jena.riot.RDFParser ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFLib ; @@ -68,8 +68,7 @@ public class GraphLoadUtils // We need to do this ourselves, not via riot, to use the webStreamManager StreamRDF sink = StreamRDFLib.graph(graph) ; sink = new StreamRDFLimited(sink, limit) ; - TypedInputStream input = Fuseki.webStreamManager.open(uri) ; - RDFDataMgr.parse(sink, input, uri) ; + RDFParser.source(input).base(uri).parse(sink); } } http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/DataValidatorJSON.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/DataValidatorJSON.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/DataValidatorJSON.java index ce96603..3afe9be 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/DataValidatorJSON.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/DataValidatorJSON.java @@ -59,8 +59,7 @@ public class DataValidatorJSON { StreamRDF dest = StreamRDFLib.sinkNull() ; try { - // Set error handler! - RDFDataMgr.parse(dest, sr, null, language) ; + RDFParser.create().source(sr).lang(language).parse(dest); } catch (RiotParseException ex) { obj.key(jErrors) ; http://git-wip-us.apache.org/repos/asf/jena/blob/931a437b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java index 6ee42d4..c7704fd 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java @@ -24,9 +24,7 @@ import org.apache.http.entity.EntityTemplate ; import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.atlas.web.HttpException ; import org.apache.jena.atlas.web.TypedInputStream ; -import org.apache.jena.riot.RDFDataMgr ; -import org.apache.jena.riot.RDFFormat ; -import org.apache.jena.riot.WebContent ; +import org.apache.jena.riot.* ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFLib ; import org.apache.jena.riot.web.HttpOp ; @@ -119,11 +117,15 @@ public class TestDatasetOps extends AbstractFusekiTest private void gsp_x_ct(String urlDataset, String acceptheader, String contentTypeResponse) { HttpEntity e = datasetToHttpEntity(data) ; HttpOp.execHttpPut(urlDataset(), e); - TypedInputStream in = HttpOp.execHttpGet(urlDataset, acceptheader) ; - assertEqualsIgnoreCase(contentTypeResponse, in.getContentType()) ; - DatasetGraph dsg = DatasetGraphFactory.create() ; - StreamRDF dest = StreamRDFLib.dataset(dsg) ; - RDFDataMgr.parse(dest, in) ; + + // Do manually so the test can validate the expected ContentType + try ( TypedInputStream in = HttpOp.execHttpGet(urlDataset, acceptheader) ) { + assertEqualsIgnoreCase(contentTypeResponse, in.getContentType()) ; + Lang lang = RDFLanguages.contentTypeToLang(in.getContentType()); + DatasetGraph dsg = DatasetGraphFactory.create() ; + StreamRDF dest = StreamRDFLib.dataset(dsg) ; + RDFParser.source(in).lang(lang).parse(dest); + } } @Test
