Merge branch 'master' into JENA-491-construct-quads
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0bd45a51 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0bd45a51 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0bd45a51 Branch: refs/heads/JENA-491-construct-quads Commit: 0bd45a5103b8b406652994a866150a7bd960788c Parents: d5a3f8b c74a042 Author: Andy Seaborne <[email protected]> Authored: Thu Aug 20 20:02:44 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu Aug 20 20:02:44 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/jena/riot/RDFDataMgr.java | 30 +- .../org/apache/jena/riot/RDFParserRegistry.java | 10 +- .../java/org/apache/jena/riot/ReaderRIOT.java | 4 +- .../java/org/apache/jena/riot/RiotReader.java | 254 +++-------------- .../org/apache/jena/riot/lang/JsonLDReader.java | 2 + .../apache/jena/riot/lang/PipedRDFIterator.java | 2 + .../org/apache/jena/riot/lang/ReaderTriX.java | 5 +- .../org/apache/jena/riot/lang/RiotParsers.java | 230 +++++++++++++++ .../src/main/java/riotcmd/CmdLangParse.java | 7 +- .../jena/riot/lang/ParserTestBaseLib.java | 76 +++++ .../apache/jena/riot/lang/TestLangNQuads.java | 78 ++---- .../apache/jena/riot/lang/TestLangNTriples.java | 130 ++++----- .../apache/jena/riot/lang/TestLangNTuples.java | 73 +++-- .../apache/jena/riot/lang/TestLangRdfJson.java | 280 ++++++++----------- .../org/apache/jena/riot/lang/TestLangTrig.java | 24 +- .../apache/jena/riot/lang/TestLangTurtle.java | 37 +-- .../jena/riot/lang/TestParserFactory.java | 32 ++- .../jena/riot/lang/TestPipedRDFIterators.java | 6 +- .../jena/riot/lang/TestReaderNTriples.java | 24 -- .../apache/jena/riot/lang/TestTurtleTerms.java | 3 +- .../jena/fuseki/validation/DataValidator.java | 4 +- 21 files changed, 659 insertions(+), 652 deletions(-) ----------------------------------------------------------------------
