JENA-1285: Merge commit 'refs/pull/213/head' of github.com:apache/jena This closes #213.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3673d6ad Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3673d6ad Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3673d6ad Branch: refs/heads/master Commit: 3673d6adb961b4736bdda1971833826ba9c5daa7 Parents: fa0fb48 b163428 Author: Andy Seaborne <[email protected]> Authored: Wed Feb 8 12:33:32 2017 +0000 Committer: Andy Seaborne <[email protected]> Committed: Wed Feb 8 12:33:32 2017 +0000 ---------------------------------------------------------------------- .../apache/jena/atlas/json/io/parser/JSONP.java | 9 +- .../atlas/json/io/parser/JSONParserBase.java | 8 +- .../atlas/json/io/parser/TokenizerJSON.java | 36 ++++-- .../org/apache/jena/riot/lang/LangNTuple.java | 28 ++--- .../org/apache/jena/riot/lang/LangRDFJSON.java | 4 +- .../jena/riot/system/ParserProfileBase.java | 4 - .../org/apache/jena/riot/tokens/StringType.java | 31 +++++ .../java/org/apache/jena/riot/tokens/Token.java | 72 +++++------ .../org/apache/jena/riot/tokens/TokenType.java | 8 +- .../apache/jena/riot/tokens/TokenizerText.java | 22 ++-- .../sparql/resultset/JSONInputIterator.java | 10 +- .../apache/jena/riot/tokens/TestTokenizer.java | 69 ++++++----- .../java/org/apache/jena/graph/GraphUtil.java | 123 ++++++++++--------- .../jena/graph/test/AbstractTestGraph.java | 32 ++++- 14 files changed, 271 insertions(+), 185 deletions(-) ----------------------------------------------------------------------
