Repository: jena Updated Branches: refs/heads/master 668deecba -> 1042f4cce
JENA-997 : ".json" is no longer an extension for RDF/JSON. JSON-LD unaffected. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1042f4cc Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1042f4cc Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1042f4cc Branch: refs/heads/master Commit: 1042f4cce48988db89359a48eb4c9836856773be Parents: 668deec Author: Andy Seaborne <[email protected]> Authored: Thu Jul 23 20:24:18 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu Jul 23 20:24:18 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/jena/riot/RDFLanguages.java | 2 +- .../java/org/apache/jena/riot/TestJenaReaderRIOT.java | 6 ++++-- .../src/test/java/org/apache/jena/riot/TestLangRIOT.java | 3 ++- .../org/apache/jena/riot/stream/TestStreamManager.java | 6 ++++-- jena-arq/testing/RIOT/Reader/D.json | 5 ----- jena-arq/testing/RIOT/Reader/D.jsonld | 10 ++++++++++ jena-arq/testing/RIOT/Reader/D.rj | 5 +++++ jena-arq/testing/RIOT/StreamManager/D.json | 5 ----- jena-arq/testing/RIOT/StreamManager/D.jsonld | 10 ++++++++++ jena-arq/testing/RIOT/StreamManager/D.rj | 5 +++++ 10 files changed, 41 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java index f67614f..9764aa5 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java @@ -100,7 +100,7 @@ public class RDFLanguages /** <a href="http://www.w3.org/TR/rdf-json/";>RDF/JSON</a>. This is not <a href="http://www.w3.org/TR/json-ld/";>JSON-LD</a>. */ public static final Lang RDFJSON = LangBuilder.create(strLangRDFJSON, contentTypeRDFJSON) .addAltNames("RDFJSON") - .addFileExtensions("rj", "json") + .addFileExtensions("rj") .build() ; /** <a href="http://www.w3.org/TR/trig/";>TriG</a> */ http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java b/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java index fd89792..43de994 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java @@ -57,13 +57,15 @@ public class TestJenaReaderRIOT extends BaseTest @Test public void read_02() { jenaread("D.ttl") ; } @Test public void read_03() { jenaread("D.rdf") ; } @Test public void read_04() { jenaread("D.rdf") ; } - @Test public void read_05() { jenaread("D.json") ; } + @Test public void read_05() { jenaread("D.rj") ; } + @Test public void read_06() { jenaread("D.jsonld") ; } @Test public void read_11() { jenaread("D.nt", "N-TRIPLES") ; } @Test public void read_12() { jenaread("D.ttl", "TTL") ; } @Test public void read_13() { jenaread("D.rdf", "RDF/XML") ; } @Test public void read_14() { jenaread("D.rdf", "RDF/XML-ABBREV") ; } - @Test public void read_15() { jenaread("D.json", "RDF/JSON") ; } + @Test public void read_15() { jenaread("D.rj", "RDF/JSON") ; } + @Test public void read_16() { jenaread("D.jsonld", "JSON-LD") ; } @Test public void read_21a() { jenaread("D-nt", "N-TRIPLES") ; } @Test public void read_21b() { jenaread("D-nt", "NTRIPLES") ; } http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java b/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java index f65641b..18223da 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java @@ -58,10 +58,11 @@ public class TestLangRIOT extends BaseTest //@Test public void guess_05() { guess("D.owl", RDFLanguages.RDFXML) ; } @Test public void guess_06() { guess("D.rj", RDFLanguages.RDFJSON) ; } - @Test public void guess_07() { guess("D.json", RDFLanguages.RDFJSON) ; } + // Jena2 - changed JENA-997 : @Test public void guess_07() { guess("D.json", RDFLanguages.RDFJSON) ; } @Test public void guess_08() { guess("D.nq", RDFLanguages.NQUADS) ; } @Test public void guess_09() { guess("D.trig", RDFLanguages.TRIG) ; } + @Test public void guess_10() { guess("D.jsonld", RDFLanguages.JSONLD) ; } private void test(Lang expected, String string) { http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java b/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java index c1d3e59..d327c7d 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java @@ -98,12 +98,14 @@ public class TestStreamManager extends BaseTest @Test public void fm_read_01() { read("D.nt") ; } @Test public void fm_read_02() { read("D.ttl") ; } @Test public void fm_read_03() { read("D.rdf") ; } - @Test public void fm_read_04() { read("D.json") ; } + @Test public void fm_read_04() { read("D.rj") ; } + @Test public void fm_read_05() { read("D.jsonld") ; } @Test public void fm_read_11() { read("file:D.nt") ; } @Test public void fm_read_12() { read("file:D.ttl") ; } @Test public void fm_read_13() { read("file:D.rdf") ; } - @Test public void fm_read_14() { read("file:D.json") ; } + @Test public void fm_read_14() { read("file:D.rj") ; } + @Test public void fm_read_15() { read("file:D.jsonld") ; } // TriG // NQuads http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/testing/RIOT/Reader/D.json ---------------------------------------------------------------------- diff --git a/jena-arq/testing/RIOT/Reader/D.json b/jena-arq/testing/RIOT/Reader/D.json deleted file mode 100644 index b3e6e19..0000000 --- a/jena-arq/testing/RIOT/Reader/D.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "http://example/s"; : - { "http://example/p"; : [ - { "value" : "one", "type" : "literal" } , - { "value" : "two", "type" : "literal" } ] - }} http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/testing/RIOT/Reader/D.jsonld ---------------------------------------------------------------------- diff --git a/jena-arq/testing/RIOT/Reader/D.jsonld b/jena-arq/testing/RIOT/Reader/D.jsonld new file mode 100644 index 0000000..73c05fd --- /dev/null +++ b/jena-arq/testing/RIOT/Reader/D.jsonld @@ -0,0 +1,10 @@ +{ + "@id" : "http://example/s";, + "p" : "http://example/o";, + "@context" : { + "p" : { + "@id" : "http://example/p";, + "@type" : "@id" + } + } +} http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/testing/RIOT/Reader/D.rj ---------------------------------------------------------------------- diff --git a/jena-arq/testing/RIOT/Reader/D.rj b/jena-arq/testing/RIOT/Reader/D.rj new file mode 100644 index 0000000..b3e6e19 --- /dev/null +++ b/jena-arq/testing/RIOT/Reader/D.rj @@ -0,0 +1,5 @@ +{ "http://example/s"; : + { "http://example/p"; : [ + { "value" : "one", "type" : "literal" } , + { "value" : "two", "type" : "literal" } ] + }} http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/testing/RIOT/StreamManager/D.json ---------------------------------------------------------------------- diff --git a/jena-arq/testing/RIOT/StreamManager/D.json b/jena-arq/testing/RIOT/StreamManager/D.json deleted file mode 100644 index b3e6e19..0000000 --- a/jena-arq/testing/RIOT/StreamManager/D.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "http://example/s"; : - { "http://example/p"; : [ - { "value" : "one", "type" : "literal" } , - { "value" : "two", "type" : "literal" } ] - }} http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/testing/RIOT/StreamManager/D.jsonld ---------------------------------------------------------------------- diff --git a/jena-arq/testing/RIOT/StreamManager/D.jsonld b/jena-arq/testing/RIOT/StreamManager/D.jsonld new file mode 100644 index 0000000..73c05fd --- /dev/null +++ b/jena-arq/testing/RIOT/StreamManager/D.jsonld @@ -0,0 +1,10 @@ +{ + "@id" : "http://example/s";, + "p" : "http://example/o";, + "@context" : { + "p" : { + "@id" : "http://example/p";, + "@type" : "@id" + } + } +} http://git-wip-us.apache.org/repos/asf/jena/blob/1042f4cc/jena-arq/testing/RIOT/StreamManager/D.rj ---------------------------------------------------------------------- diff --git a/jena-arq/testing/RIOT/StreamManager/D.rj b/jena-arq/testing/RIOT/StreamManager/D.rj new file mode 100644 index 0000000..b3e6e19 --- /dev/null +++ b/jena-arq/testing/RIOT/StreamManager/D.rj @@ -0,0 +1,5 @@ +{ "http://example/s"; : + { "http://example/p"; : [ + { "value" : "one", "type" : "literal" } , + { "value" : "two", "type" : "literal" } ] + }}
