You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/11/09 17:00:32 UTC
svn commit: r1540337 - in /jena/trunk:
jena-arq/src/main/java/org/apache/jena/riot/adapters/
jena-arq/src/main/java/org/apache/jena/riot/system/
jena-arq/src/test/java/org/apache/jena/riot/system/
jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/
Author: andy
Date: Sat Nov 9 16:00:32 2013
New Revision: 1540337
URL: http://svn.apache.org/r1540337
Log:
JENA-585 : Add a reader that is as web-friendly as possible.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1540337&r1=1540336&r2=1540337&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java Sat Nov 9 16:00:32 2013
@@ -276,9 +276,6 @@ public class AdapterFileManager extends
syntax = RDFLanguages.guessContentType(mappedURI).getContentType() ;
Lang lang = RDFLanguages.nameToLang(syntax) ;
-// if ( lang == null )
-// // This overrides content negotiation (best compatibility with old jena).
-// lang = RDFLanguages.filenameToLang(mappedURI) ;
RDFDataMgr.read(model, mappedURI, baseURI, lang);
return model ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java?rev=1540337&r1=1540336&r2=1540337&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java Sat Nov 9 16:00:32 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.adapters;
+package org.apache.jena.riot.adapters ;
import java.io.InputStream ;
import java.io.Reader ;
@@ -34,71 +34,69 @@ import com.hp.hpl.jena.rdf.model.impl.RD
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.sparql.util.Symbol ;
-/** Adapter from Jena2 original style adapter to RIOT reader. */
-public class RDFReaderRIOT implements RDFReader
-{
- private final String basename ; // This will be per reader instance.
- protected final Lang hintlang ;
- protected Context context = new Context() ;
- protected RDFErrorHandler errorHandler = new RDFDefaultErrorHandler();
-
- public RDFReaderRIOT()
- {
- basename = "org.apache.jena.riot.reader.generic" ;
- hintlang = null ;
- }
-
- public RDFReaderRIOT(String lang)
- {
- basename = "org.apache.jena.riot.reader."+lang.toLowerCase(Locale.ROOT) ;
- hintlang = RDFLanguages.nameToLang(lang) ;
+/** Adapter from Jena2 original style adapter to RIOT reader. */
+public class RDFReaderRIOT implements RDFReader {
+ private final String basename ;
+ protected final Lang hintlang ;
+ protected Context context = new Context() ;
+ protected RDFErrorHandler errorHandler = new RDFDefaultErrorHandler() ;
+
+ public RDFReaderRIOT() {
+ this((Lang)null) ;
+ }
+
+ public RDFReaderRIOT(String lang) {
+ this(RDFLanguages.nameToLang(lang)) ;
+ }
+
+ public RDFReaderRIOT(Lang hintlang) {
+ this.hintlang = hintlang ;
+ this.basename = (hintlang==null)
+ ? "org.apache.jena.riot.reader.generic"
+ : "org.apache.jena.riot.reader." + hintlang.getLabel().toLowerCase(Locale.ROOT) ;
}
@SuppressWarnings("deprecation")
@Override
- public void read(Model model, Reader r, String base)
- {
- startRead(model) ;
+ public void read(Model model, Reader r, String base) {
+ startRead(model) ;
RDFDataMgr.read(model, r, base, hintlang) ;
finishRead(model) ;
}
@Override
- public void read(Model model, InputStream r, String base)
- {
- startRead(model) ;
+ public void read(Model model, InputStream r, String base) {
+ startRead(model) ;
RDFDataMgr.read(model, r, base, hintlang) ;
finishRead(model) ;
}
-
+
@Override
- public void read(Model model, String url)
- {
+ public void read(Model model, String url) {
startRead(model) ;
RDFDataMgr.read(model, url, hintlang) ;
finishRead(model) ;
}
@Override
- public Object setProperty(String propName, Object propValue)
- {
- Symbol sym = Symbol.create(basename+propName) ;
+ public Object setProperty(String propName, Object propValue) {
+ Symbol sym = Symbol.create(basename + propName) ;
Object oldObj = context.get(sym) ;
return oldObj ;
}
-
- protected void startRead(Model model)
- { model.notifyEvent( GraphEvents.startRead ); }
-
- protected void finishRead(Model model)
- { model.notifyEvent( GraphEvents.finishRead ) ; }
-
+
+ protected void startRead(Model model) {
+ model.notifyEvent(GraphEvents.startRead) ;
+ }
+
+ protected void finishRead(Model model) {
+ model.notifyEvent(GraphEvents.finishRead) ;
+ }
+
@Override
- public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler)
- {
+ public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler) {
RDFErrorHandler old = errorHandler ;
errorHandler = errHandler ;
return old ;
}
}
-
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java?rev=1540337&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java Sat Nov 9 16:00:32 2013
@@ -0,0 +1,100 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.adapters;
+
+import java.io.InputStream ;
+import java.io.Reader ;
+
+import org.apache.jena.atlas.lib.Lib ;
+import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.WebContent ;
+import org.apache.jena.riot.stream.StreamManager ;
+
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.shared.NotFoundException ;
+
+/** This is a reader primarily for model.read(url)
+ */
+public class RDFReaderRIOT_Web extends RDFReaderRIOT
+{
+ private static final String defaultSyntax = "RDF/XML" ;
+
+ public RDFReaderRIOT_Web()
+ {
+ super(defaultSyntax) ;
+ }
+
+ @SuppressWarnings("deprecation")
+ @Override
+ public void read(Model model, Reader r, String base)
+ {
+ // model.read(Reader, baseURI)
+ startRead(model) ;
+ RDFDataMgr.read(model, r, base, hintlang) ;
+ finishRead(model) ;
+ }
+
+
+ @Override
+ public void read(Model model, InputStream r, String base)
+ {
+ // model.read(InputStream, baseURI)
+ startRead(model) ;
+ RDFDataMgr.read(model, r, base, hintlang) ;
+ finishRead(model) ;
+ }
+
+ @Override
+ public void read(Model model, String url)
+ {
+ // model.read(url)
+ TypedInputStream in = StreamManager.get().open(url) ;
+ if ( in == null )
+ throw new NotFoundException(url) ;
+ String contentType = in.getContentType() ;
+
+ // Reading a URL, no hint language provided.
+ // Use the URL structure as the hint.
+ Lang lang = null ;
+ if ( ! Lib.equal(contentType, WebContent.contentTypeTextPlain) )
+ lang = RDFLanguages.contentTypeToLang(contentType) ;
+
+ if ( lang == null )
+ lang = RDFLanguages.filenameToLang(url) ;
+
+ if ( lang == null )
+ lang = super.hintlang ;
+
+ // Here, we want syntax determination to be:
+ // ctLang > fileExtLang > RDF/XML
+ //
+ // whereas RDFDataMgr.read(.. , lang) ;
+ // treats lang to override.
+
+ // **
+
+ startRead(model) ;
+ RDFDataMgr.read(model, in, url, lang) ;
+ finishRead(model) ;
+ }
+}
+
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java?rev=1540337&r1=1540336&r2=1540337&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java Sat Nov 9 16:00:32 2013
@@ -19,6 +19,7 @@
package org.apache.jena.riot.system;
import org.apache.jena.riot.adapters.JenaReadersWriters ;
+import org.apache.jena.riot.adapters.RDFReaderRIOT_Web ;
import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl ;
import com.hp.hpl.jena.sparql.util.Symbol ;
@@ -31,7 +32,8 @@ public class IO_JenaReaders
public static void wireIntoJena()
{
- registerForModelRead("RDF/XML", JenaReadersWriters.RDFReaderRIOT_RDFXML.class) ; // And default
+ registerForModelRead("RDF", RDFReaderRIOT_Web.class) ; // Default
+ registerForModelRead("RDF/XML", JenaReadersWriters.RDFReaderRIOT_RDFXML.class) ;
registerForModelRead("RDF/XML-ABBREV", JenaReadersWriters.RDFReaderRIOT_RDFXML.class) ;
registerForModelRead("N-TRIPLES", JenaReadersWriters.RDFReaderRIOT_NT.class) ;
@@ -51,20 +53,21 @@ public class IO_JenaReaders
public static void resetJena()
{
- RDFReaderFImpl.setBaseReaderClassName("RDF/XML", jenaRDFReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("RDF", jenaRDFReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("RDF/XML", jenaRDFReader) ;
RDFReaderFImpl.setBaseReaderClassName("RDF/XML-ABBREV", jenaRDFReader) ;
- RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", jenaNTriplesReader) ;
- RDFReaderFImpl.setBaseReaderClassName("N-Triples", jenaNTriplesReader) ;
- RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", jenaNTriplesReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", jenaNTriplesReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("N-Triples", jenaNTriplesReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", jenaNTriplesReader) ;
- RDFReaderFImpl.setBaseReaderClassName("N3", jenaTurtleReader) ;
- RDFReaderFImpl.setBaseReaderClassName("TURTLE", jenaTurtleReader) ;
- RDFReaderFImpl.setBaseReaderClassName("Turtle", jenaTurtleReader) ;
- RDFReaderFImpl.setBaseReaderClassName("TTL", jenaTurtleReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("N3", jenaTurtleReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("TURTLE", jenaTurtleReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("Turtle", jenaTurtleReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("TTL", jenaTurtleReader) ;
- RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", "") ;
- RDFReaderFImpl.setBaseReaderClassName("RDFJSON", "") ;
+ RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", "") ;
+ RDFReaderFImpl.setBaseReaderClassName("RDFJSON", "") ;
}
/** Register for use with Model.read (old style compatibility) */
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java?rev=1540337&r1=1540336&r2=1540337&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java Sat Nov 9 16:00:32 2013
@@ -17,23 +17,24 @@
*/
package org.apache.jena.riot.system;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals ;
+import static org.junit.Assert.assertFalse ;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
+import java.util.LinkedHashMap ;
+import java.util.Map ;
+import java.util.Properties ;
import org.apache.jena.riot.IO_Jena ;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_NT;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_RDFJSON;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_RDFXML;
-import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_TTL;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_NT ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_RDFJSON ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_RDFXML ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_TTL ;
+import org.apache.jena.riot.adapters.* ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
-import org.junit.Test;
+import org.junit.Test ;
-import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl;
+import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl ;
public class TestIO_JenaReaders {
@BeforeClass public static void beforeClass() { }
@@ -56,17 +57,17 @@ public class TestIO_JenaReaders {
public void wireIntoJena() throws Exception {
IO_JenaReaders.wireIntoJena();
RDFReaderFImpl readerF = new RDFReaderFImpl();
- assertEquals(RDFReaderRIOT_RDFXML.class, readerF.getReader().getClass());
- assertEquals(RDFReaderRIOT_RDFXML.class, readerF.getReader("RDF/XML").getClass());
- assertEquals(RDFReaderRIOT_RDFXML.class, readerF.getReader("RDF/XML-ABBREV").getClass());
- assertEquals(RDFReaderRIOT_NT.class, readerF.getReader("N-TRIPLES").getClass());
- assertEquals(RDFReaderRIOT_NT.class, readerF.getReader("N-Triples").getClass());
- assertEquals(RDFReaderRIOT_NT.class, readerF.getReader("N-TRIPLE").getClass());
- assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("N3").getClass());
- assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("TURTLE").getClass());
- assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("Turtle").getClass());
- assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("TTL").getClass());
- assertEquals(RDFReaderRIOT_RDFJSON.class, readerF.getReader("RDF/JSON").getClass());
+ assertEquals(RDFReaderRIOT_Web.class, readerF.getReader().getClass());
+ assertEquals(RDFReaderRIOT_RDFXML.class, readerF.getReader("RDF/XML").getClass());
+ assertEquals(RDFReaderRIOT_RDFXML.class, readerF.getReader("RDF/XML-ABBREV").getClass());
+ assertEquals(RDFReaderRIOT_NT.class, readerF.getReader("N-TRIPLES").getClass());
+ assertEquals(RDFReaderRIOT_NT.class, readerF.getReader("N-Triples").getClass());
+ assertEquals(RDFReaderRIOT_NT.class, readerF.getReader("N-TRIPLE").getClass());
+ assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("N3").getClass());
+ assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("TURTLE").getClass());
+ assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("Turtle").getClass());
+ assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("TTL").getClass());
+ assertEquals(RDFReaderRIOT_RDFJSON.class, readerF.getReader("RDF/JSON").getClass());
}
@Test
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java?rev=1540337&r1=1540336&r2=1540337&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java Sat Nov 9 16:00:32 2013
@@ -29,18 +29,16 @@ import com.hp.hpl.jena.JenaRuntime ;
/**
*/
public class RDFReaderFImpl extends Object implements RDFReaderF {
-
+ // ** The setting in this class are overrided by RIOT **
private static final String GRDDLREADER = "com.hp.hpl.jena.grddl.GRDDLReader";
private static final String TURTLEREADER = "com.hp.hpl.jena.n3.turtle.TurtleReader" ;
- // Old reader (N3 based)
- //private static final String TURTLEREADER = "com.hp.hpl.jena.n3.N3TurtleJenaReader" ;
-
protected static Properties langToClassName = null;
// predefined languages - these should probably go in a properties file
- protected static final String LANGS[] = { "RDF/XML",
+ protected static final String LANGS[] = { "RDF" ,
+ "RDF/XML",
"RDF/XML-ABBREV",
"N-TRIPLE",
"N-TRIPLES",
@@ -55,10 +53,11 @@ public class RDFReaderFImpl extends Obje
protected static final String DEFAULTREADERS[] = {
"com.hp.hpl.jena.rdf.arp.JenaReader",
"com.hp.hpl.jena.rdf.arp.JenaReader",
+ "com.hp.hpl.jena.rdf.arp.JenaReader",
Jena.PATH + ".rdf.model.impl.NTripleReader",
Jena.PATH + ".rdf.model.impl.NTripleReader",
Jena.PATH + ".rdf.model.impl.NTripleReader",
- TURTLEREADER, //com.hp.hpl.jena.n3.N3JenaReader.class.getName(), // N3 replaced by a Turtle-based parser
+ TURTLEREADER, // N3 replaced by a Turtle-based parser
TURTLEREADER,
TURTLEREADER,
TURTLEREADER,