Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9C943200C7A for ; Tue, 11 Apr 2017 12:05:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9B80A160B89; Tue, 11 Apr 2017 10:05:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B0FE160BB0 for ; Tue, 11 Apr 2017 12:05:30 +0200 (CEST) Received: (qmail 67842 invoked by uid 500); 11 Apr 2017 10:05:29 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 67476 invoked by uid 99); 11 Apr 2017 10:05:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Apr 2017 10:05:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 28EC4F49EF; Tue, 11 Apr 2017 10:05:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Date: Tue, 11 Apr 2017 10:05:43 -0000 Message-Id: <4c96cfd2a1b24ee5ad1fe6a9552484f9@git.apache.org> In-Reply-To: <622e59a2163c4dffae17e610c3da6455@git.apache.org> References: <622e59a2163c4dffae17e610c3da6455@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/17] jena git commit: JENA-1315: Merge commit 'refs/pull/234/head' of github.com:apache/jena archived-at: Tue, 11 Apr 2017 10:05:31 -0000 JENA-1315: Merge commit 'refs/pull/234/head' of github.com:apache/jena This closes #234. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dc81a421 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dc81a421 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dc81a421 Branch: refs/heads/master Commit: dc81a421f63277e8d62020581d7fb1936079ed37 Parents: 588f43f 7df447a Author: Andy Seaborne Authored: Tue Apr 11 10:31:07 2017 +0100 Committer: Andy Seaborne Committed: Tue Apr 11 10:31:07 2017 +0100 ---------------------------------------------------------------------- .../arq/examples/riot/ExRIOT_5.java | 16 +- .../main/java/org/apache/jena/riot/Lang.java | 7 +- .../java/org/apache/jena/riot/RDFDataMgr.java | 15 +- .../java/org/apache/jena/riot/RDFLanguages.java | 36 +- .../java/org/apache/jena/riot/RDFParser.java | 61 +++- .../org/apache/jena/riot/RDFParserBuilder.java | 71 +++- .../org/apache/jena/riot/RDFParserRegistry.java | 87 ++--- .../java/org/apache/jena/riot/ReaderRIOT.java | 17 +- .../org/apache/jena/riot/ReaderRIOTFactory.java | 11 +- .../org/apache/jena/riot/lang/JsonLDReader.java | 50 +-- .../org/apache/jena/riot/lang/LangBase.java | 9 +- .../java/org/apache/jena/riot/lang/LangCSV.java | 152 -------- .../org/apache/jena/riot/lang/LangEngine.java | 199 +++++------ .../org/apache/jena/riot/lang/LangNQuads.java | 5 +- .../org/apache/jena/riot/lang/LangNTuple.java | 4 +- .../org/apache/jena/riot/lang/LangRDFJSON.java | 1 - .../org/apache/jena/riot/lang/LangRDFXML.java | 250 -------------- .../org/apache/jena/riot/lang/LangRIOT.java | 7 +- .../org/apache/jena/riot/lang/LangTriG.java | 4 +- .../apache/jena/riot/lang/LangTurtleBase.java | 40 +-- .../apache/jena/riot/lang/ReaderRDFNULL.java | 33 +- .../apache/jena/riot/lang/ReaderRIOTCSV.java | 141 ++++++++ .../apache/jena/riot/lang/ReaderRIOTRDFXML.java | 245 +++++++++++++ .../org/apache/jena/riot/lang/ReaderTriX.java | 63 ++-- .../org/apache/jena/riot/lang/RiotParsers.java | 233 +++++-------- .../jena/riot/resultset/ResultSetLang.java | 12 +- .../org/apache/jena/riot/system/MakerRDF.java | 77 ----- .../apache/jena/riot/system/MakerRDFStd.java | 303 ---------------- .../apache/jena/riot/system/ParserProfile.java | 113 +++--- .../jena/riot/system/ParserProfileBase.java | 219 ------------ .../jena/riot/system/ParserProfileChecker.java | 140 -------- .../jena/riot/system/ParserProfileStd.java | 269 +++++++++++++++ .../org/apache/jena/riot/system/RiotLib.java | 344 ++++++++++--------- .../riot/system/SerializationFactoryFinder.java | 21 +- .../apache/jena/riot/writer/JsonLDWriter.java | 12 +- .../engine/binding/BindingInputStream.java | 9 +- .../apache/jena/riot/ErrorHandlerTestLib.java | 2 + .../org/apache/jena/riot/TestRDFParser.java | 9 + .../org/apache/jena/riot/lang/TestLangCSV.java | 4 +- .../apache/jena/riot/lang/TestLangNTriples.java | 16 +- .../apache/jena/riot/lang/TestLangNTuples.java | 28 +- .../apache/jena/riot/lang/TestLangRdfJson.java | 3 +- .../apache/jena/riot/lang/TestLangTurtle.java | 3 +- .../jena/riot/lang/TestParserFactory.java | 45 ++- .../apache/jena/riot/lang/TestTriXReader.java | 2 +- .../apache/jena/riot/lang/TestTurtleTerms.java | 8 +- .../jena/riot/writer/TestJsonLDWriter.java | 161 ++++++--- .../main/java/arq/cmdline/ModLangOutput.java | 1 + .../java/org/apache/jena/lang/csv/CSV2RDF.java | 47 +++ .../java/org/apache/jena/lang/csv/InitCSV.java | 38 ++ .../org/apache/jena/lang/csv/ReaderRIOTCSV.java | 132 +++++++ .../jena/lang/csv/ReaderRIOTFactoryCSV.java | 31 ++ .../jena/propertytable/PropertyTable.java | 1 + .../jena/propertytable/graph/GraphCSV.java | 1 + .../impl/PropertyTableBuilder.java | 8 +- .../apache/jena/propertytable/lang/CSV2RDF.java | 10 +- .../apache/jena/propertytable/lang/LangCSV.java | 154 --------- .../lang/ReaderRIOTFactoryCSV.java | 32 -- .../propertytable/lang/ReaderRIOTLangCSV.java | 76 ---- jena-csv/src/main/java/riotcmdx/csv2rdf.java | 4 +- ...rg.apache.jena.system.JenaSubsystemLifecycle | 2 +- .../org/apache/jena/lang/csv/TS_LangCSV.java | 28 ++ .../org/apache/jena/lang/csv/TestLangCSV.java | 114 ++++++ .../jena/propertytable/TS_PropertyTable.java | 2 - .../jena/propertytable/lang/TestLangCSV.java | 111 ------ jena-csv/src/test/resources/test.csv | 6 +- .../jena/hadoop/rdf/io/types/RdfTypesTest.java | 1 - .../io/input/AbstractNLineFileInputFormat.java | 1 + .../AbstractBlockBasedNodeTupleReader.java | 33 +- .../AbstractLineBasedNodeTupleReader.java | 36 +- .../readers/AbstractLineBasedQuadReader.java | 8 +- .../readers/AbstractLineBasedTripleReader.java | 8 +- .../AbstractWholeFileNodeTupleReader.java | 23 +- .../io/input/readers/TriplesOrQuadsReader.java | 1 - .../io/input/readers/nquads/NQuadsReader.java | 14 +- .../input/readers/ntriples/NTriplesReader.java | 12 +- .../hadoop/rdf/io/input/util/RdfIOUtils.java | 25 +- .../writers/AbstractBatchedQuadWriter.java | 2 +- .../writers/AbstractWholeFileQuadWriter.java | 2 +- .../AbstractWholeFileQuadInputFormatTests.java | 2 +- .../io/input/bnodes/AbstractBlankNodeTests.java | 3 - .../io/input/bnodes/RdfThriftBlankNodeTest.java | 2 +- ...CompressedWholeFileQuadInputFormatTests.java | 2 +- .../util/AbstractTrackableInputStreamTests.java | 91 ++--- .../rdf/io/input/util/BlockInputStreamTest.java | 16 +- .../AbstractNodeTupleOutputFormatTests.java | 1 - .../output/trig/TriGBlankNodeOutputTests.java | 6 +- .../turtle/TurtleBlankNodeOutputTests.java | 4 + .../group/AbstractQuadGroupingMapper.java | 1 + .../filter/AbstractQuadValidityFilterTests.java | 2 +- .../AbstractTripleValidityFilterTests.java | 2 +- .../apache/jena/hadoop/rdf/stats/RdfStats.java | 86 +++-- .../java/org/apache/jena/sdb/sql/TableDump.java | 4 +- .../apache/jena/sdb/store/TupleLoaderOne.java | 3 +- .../java/org/apache/jena/sdb/util/StrUtils.java | 4 +- .../src/main/java/org/apache/jena/tdb/TDB.java | 4 +- 96 files changed, 2171 insertions(+), 2583 deletions(-) ----------------------------------------------------------------------