JENA-1287: Merge commit 'refs/pull/215/head' of github.com:apache/jena This closes #215.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6b8f8d67 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6b8f8d67 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6b8f8d67 Branch: refs/heads/ThreadPerGraphDataset Commit: 6b8f8d6753685df7763d213aa2cddc79c69d24e3 Parents: 3673d6a e2f53c3 Author: Andy Seaborne <[email protected]> Authored: Wed Feb 8 12:42:25 2017 +0000 Committer: Andy Seaborne <[email protected]> Committed: Wed Feb 8 12:42:25 2017 +0000 ---------------------------------------------------------------------- .../java/org/apache/jena/atlas/json/JSON.java | 37 +++++++- .../org/apache/jena/atlas/json/JsonBuilder.java | 96 +++++++++++++++++++- .../org/apache/jena/atlas/json/io/JSWriter.java | 43 ++++++--- .../atlas/json/io/parser/JSONParserBase.java | 1 - .../org/apache/jena/atlas/json/TS_JSON.java | 1 + .../org/apache/jena/atlas/json/TestJson.java | 3 +- .../org/apache/jena/atlas/json/TestJsonAPI.java | 46 ++++++++++ .../apache/jena/atlas/json/TestJsonBuilder.java | 47 ++++++++-- .../org/apache/jena/atlas/json/TestJsonExt.java | 6 +- 9 files changed, 251 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/6b8f8d67/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java ----------------------------------------------------------------------
