Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E975BDC06 for ; Fri, 17 Aug 2012 14:08:55 +0000 (UTC) Received: (qmail 31234 invoked by uid 500); 17 Aug 2012 14:08:55 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 31207 invoked by uid 500); 17 Aug 2012 14:08:55 -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 31197 invoked by uid 99); 17 Aug 2012 14:08:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Aug 2012 14:08:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Aug 2012 14:08:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6851C2388900 for ; Fri, 17 Aug 2012 14:08:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1374272 - in /jena/Experimental/riot-reader: ./ src/main/java/riot_reader/WebReader2.java src/test/java/riot_reader/TestJenaReaderRIOT.java Date: Fri, 17 Aug 2012 14:08:08 -0000 To: commits@jena.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120817140808.6851C2388900@eris.apache.org> Author: andy Date: Fri Aug 17 14:08:07 2012 New Revision: 1374272 URL: http://svn.apache.org/viewvc?rev=1374272&view=rev Log: Bodge to make more of unmodified standard Jena work. Modified: jena/Experimental/riot-reader/ (props changed) jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java jena/Experimental/riot-reader/src/test/java/riot_reader/TestJenaReaderRIOT.java Propchange: jena/Experimental/riot-reader/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 17 14:08:07 2012 @@ -0,0 +1 @@ +target Modified: jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java?rev=1374272&r1=1374271&r2=1374272&view=diff ============================================================================== --- jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java (original) +++ jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java Fri Aug 17 14:08:07 2012 @@ -74,19 +74,39 @@ public class WebReader2 public static void wireIntoJena() { - // Wire in generic - String readerRDF = RDFReaderRIOT.class.getName() ; - RDFReaderFImpl.setBaseReaderClassName("RDF/XML", readerRDF) ; // And default - RDFReaderFImpl.setBaseReaderClassName("RDF/XML-ABBREV", readerRDF) ; - - RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", readerRDF) ; - RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", readerRDF) ; - RDFReaderFImpl.setBaseReaderClassName("N3", readerRDF) ; - RDFReaderFImpl.setBaseReaderClassName("TURTLE", readerRDF) ; - RDFReaderFImpl.setBaseReaderClassName("Turtle", readerRDF) ; - RDFReaderFImpl.setBaseReaderClassName("TTL", readerRDF) ; - RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", readerRDF) ; - } +// // Wire in generic +// String readerRDF = RDFReaderRIOT.class.getName() ; +// RDFReaderFImpl.setBaseReaderClassName("RDF/XML", readerRDF) ; // And default +// RDFReaderFImpl.setBaseReaderClassName("RDF/XML-ABBREV", readerRDF) ; +// +// RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", readerRDF) ; +// RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", readerRDF) ; +// RDFReaderFImpl.setBaseReaderClassName("N3", readerRDF) ; +// RDFReaderFImpl.setBaseReaderClassName("TURTLE", readerRDF) ; +// RDFReaderFImpl.setBaseReaderClassName("Turtle", readerRDF) ; +// RDFReaderFImpl.setBaseReaderClassName("TTL", readerRDF) ; +// RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", readerRDF) ; + + RDFReaderFImpl.setBaseReaderClassName("RDF/XML", RDFReaderRIOT_RDFXML.class.getName()) ; // And default + RDFReaderFImpl.setBaseReaderClassName("RDF/XML-ABBREV", RDFReaderRIOT_RDFXML.class.getName()) ; + + RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", RDFReaderRIOT_NT.class.getName()) ; + RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", RDFReaderRIOT_NT.class.getName()) ; + RDFReaderFImpl.setBaseReaderClassName("N3", RDFReaderRIOT_TTL.class.getName()) ; + RDFReaderFImpl.setBaseReaderClassName("TURTLE", RDFReaderRIOT_TTL.class.getName()) ; + RDFReaderFImpl.setBaseReaderClassName("Turtle", RDFReaderRIOT_TTL.class.getName()) ; + RDFReaderFImpl.setBaseReaderClassName("TTL", RDFReaderRIOT_TTL.class.getName()) ; + RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", RDFReaderRIOT_RDFJSON.class.getName()) ; + } + + // Yukky hack to integrate into current jena-core where the structure of model.read assumes + // the language is determined before the reading process starts. + + public static class RDFReaderRIOT_RDFXML extends RDFReaderRIOT { public RDFReaderRIOT_RDFXML() { super("RDF/XML") ; } } + public static class RDFReaderRIOT_TTL extends RDFReaderRIOT { public RDFReaderRIOT_TTL() { super("TTL") ; } } + public static class RDFReaderRIOT_NT extends RDFReaderRIOT { public RDFReaderRIOT_NT() { super("N-TRIPLE") ; } } + public static class RDFReaderRIOT_RDFJSON extends RDFReaderRIOT { public RDFReaderRIOT_RDFJSON() { super("RDF/JSON") ; } } + public static void resetJenaReaders() { Modified: jena/Experimental/riot-reader/src/test/java/riot_reader/TestJenaReaderRIOT.java URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/riot_reader/TestJenaReaderRIOT.java?rev=1374272&r1=1374271&r2=1374272&view=diff ============================================================================== --- jena/Experimental/riot-reader/src/test/java/riot_reader/TestJenaReaderRIOT.java (original) +++ jena/Experimental/riot-reader/src/test/java/riot_reader/TestJenaReaderRIOT.java Fri Aug 17 14:08:07 2012 @@ -75,21 +75,32 @@ public class TestJenaReaderRIOT extends @Test public void read_30() { - TypedInputStream2 in = WebReader2.open(filename("D-not-TTL.ttl") ); - Model m0 = ModelFactory.createDefaultModel() ; - WebReader2.read(m0, in.getInput(), Langs.langRDFXML) ; + { + TypedInputStream2 in = WebReader2.open(filename("D-not-TTL.ttl") ); + Model m0 = ModelFactory.createDefaultModel() ; + WebReader2.read(m0, in.getInput(), Langs.langRDFXML) ; + } + + TypedInputStream2 in1 = WebReader2.open(filename("D-not-TTL.ttl") ); Model m1 = ModelFactory.createDefaultModel() ; // Fails until integration with jena-core as hintlang gets lost. - m1.read(in.getInput(), null, "RDF/XML") ; + m1.read(in1.getInput(), null, "RDF/XML") ; } // test read from StringReader.. @Test public void read_31() { - StringReader s = new StringReader("

.") ; - Model m = ModelFactory.createDefaultModel() ; - WebReader2.read(m, s, null, Langs.langNTriples) ; - m.read(s, null, "N-TRIPLES") ; + String x = "

." ; + + { + StringReader s = new StringReader(x) ; + Model m = ModelFactory.createDefaultModel() ; + WebReader2.read(m, s, null, Langs.langNTriples) ; + } + + StringReader s1 = new StringReader("

.") ; + Model m1 = ModelFactory.createDefaultModel() ; + m1.read(s1, null, "N-TRIPLES") ; } @Test public void read_32() @@ -102,10 +113,14 @@ public class TestJenaReaderRIOT extends " " , " " , "") ; - StringReader s = new StringReader(x) ; + { + StringReader s = new StringReader(x) ; + Model m = ModelFactory.createDefaultModel() ; + WebReader2.read(m, s, null, Langs.langRDFXML) ; + } + StringReader s1 = new StringReader(x) ; Model m = ModelFactory.createDefaultModel() ; - WebReader2.read(m, s, null, Langs.langRDFXML) ; - m.read(s, null, "RDF/XML") ; + m.read(s1, null, "RDF/XML") ; } // Stream opening is hardwired into jena!